epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-24 16:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14 from zapal-tech/main

Browse source 
feat: update image registry
This commit is contained in:
Bohdan Kucheriavyi 2024-02-16 16:48:55 +02:00 committed by GitHub
commit ffd250b590
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/production-image.yml vendored
View file

@ -28,9 +28,8 @@ jobs:
- name: Log in to the Container registry - name: Log in to the Container registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKER_USERNAME }}
username: ${{ github.actor }} password: ${{ secrets.DOCKER_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Bake and push - name: Bake and push
uses: docker/bake-action@v4 uses: docker/bake-action@v4

2
compose.yaml
View file

@ -1,5 +1,5 @@
x-customizable-image: &customizable_image x-customizable-image: &customizable_image
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
x-depends-on-configurator: &depends_on_configurator x-depends-on-configurator: &depends_on_configurator
depends_on: depends_on:

4
docker-bake.hcl
View file

@ -1,5 +1,5 @@
variable "REGISTRY_USER" { variable "REGISTRY_USER" {
default = "zapal-tech" default = "zapal"
} }
variable PYTHON_VERSION { variable PYTHON_VERSION {
@ -74,7 +74,7 @@ group "default" {
function "tag" { function "tag" {
params = [repo, version] params = [repo, version]
result = ["ghcr.io/${REGISTRY_USER}/${repo}:latest", "ghcr.io/${REGISTRY_USER}/${repo}:${version}"] result = ["${REGISTRY_USER}/${repo}:latest", "${REGISTRY_USER}/${repo}:${version}"]
} }
target "default-args" { target "default-args" {

18
docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -36,7 +36,7 @@ services:
REDIS_CACHE: redis-cache:6379 REDIS_CACHE: redis-cache:6379
REDIS_QUEUE: redis-queue:6379 REDIS_QUEUE: redis-queue:6379
SOCKETIO_PORT: "9000" SOCKETIO_PORT: "9000"
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -85,7 +85,7 @@ services:
UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1 UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
UPSTREAM_REAL_IP_HEADER: X-Forwarded-For UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
UPSTREAM_REAL_IP_RECURSIVE: "off" UPSTREAM_REAL_IP_RECURSIVE: "off"
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -104,7 +104,7 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -122,7 +122,7 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -156,7 +156,7 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -172,7 +172,7 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -197,11 +197,11 @@ x-backend-defaults:
depends_on: depends_on:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
volumes: volumes:
- erp-bench:/home/zapal/frappe-bench - erp-bench:/home/zapal/frappe-bench
x-customizable-image: x-customizable-image:
image: ghcr.io/zapal-tech/erp:latest image: zapal/erp:latest
x-depends-on-configurator: x-depends-on-configurator:
depends_on: depends_on:
configurator: configurator: