accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2025-01-09 16:36:26 +00:00
Code Issues Releases Activity

Merge branch 'main' of https://github.com/edardev/frappe_docker

Browse Source
This commit is contained in:
Edward Almanzar 2024-10-02 13:41:36 -04:00
commit a90dc29d68
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_bench.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV"
- name: Build and test - name: Build and test
uses: docker/bake-action@v5.7.0 uses: docker/bake-action@v5.9.0
with: with:
targets: bench-test targets: bench-test
@ -51,7 +51,7 @@ jobs:
- name: Push - name: Push
if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
uses: docker/bake-action@v5.7.0 uses: docker/bake-action@v5.9.0
with: with:
targets: bench targets: bench
push: true push: true

4
.github/workflows/docker-build-push.yml vendored
View File

@ -56,7 +56,7 @@ jobs:
echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV"
- name: Build - name: Build
uses: docker/bake-action@v5.7.0 uses: docker/bake-action@v5.9.0
with: with:
push: true push: true
env: env:
@ -84,6 +84,6 @@ jobs:
- name: Push - name: Push
if: ${{ inputs.push }} if: ${{ inputs.push }}
uses: docker/bake-action@v5.7.0 uses: docker/bake-action@v5.9.0
with: with:
push: true push: true

2
example.env
View File

@ -1,6 +1,6 @@
# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md
ERPNEXT_VERSION=v15.36.1 ERPNEXT_VERSION=v15.37.0
DB_PASSWORD=123 DB_PASSWORD=123

2
overrides/compose.https.yaml
View File

@ -8,7 +8,7 @@ services:
- traefik.http.routers.frontend-http.rule=Host(${SITES:?List of sites not set}) - traefik.http.routers.frontend-http.rule=Host(${SITES:?List of sites not set})
proxy: proxy:
image: traefik:2.5 image: traefik:v2.11
command: command:
- --providers.docker=true - --providers.docker=true
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false

2
overrides/compose.proxy.yaml
View File

@ -7,7 +7,7 @@ services:
- traefik.http.routers.frontend-http.rule=HostRegexp(`{any:.+}`) - traefik.http.routers.frontend-http.rule=HostRegexp(`{any:.+}`)
proxy: proxy:
image: traefik:2.5 image: traefik:v2.11
command: command:
- --providers.docker - --providers.docker
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false

2
overrides/compose.traefik.yaml
View File

@ -2,7 +2,7 @@ version: "3.3"
services: services:
traefik: traefik:
image: "traefik:v2.6" image: "traefik:v2.11"
restart: unless-stopped restart: unless-stopped
labels: labels:
# Enable Traefik for this service, to make it available in the public network # Enable Traefik for this service, to make it available in the public network

16
pwd.yml
View File

@ -2,7 +2,7 @@ version: "3"
services: services:
backend: backend:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -11,7 +11,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
configurator: configurator:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
deploy: deploy:
restart_policy: restart_policy:
condition: none condition: none
@ -39,7 +39,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
create-site: create-site:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
deploy: deploy:
restart_policy: restart_policy:
condition: none condition: none
@ -89,7 +89,7 @@ services:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
frontend: frontend:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
depends_on: depends_on:
- websocket - websocket
deploy: deploy:
@ -113,7 +113,7 @@ services:
- "8080:8080" - "8080:8080"
queue-long: queue-long:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -127,7 +127,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
queue-short: queue-short:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -157,7 +157,7 @@ services:
- redis-cache-data:/data - redis-cache-data:/data
scheduler: scheduler:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -169,7 +169,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
websocket: websocket:
image: frappe/erpnext:v15.36.1 image: frappe/erpnext:v15.37.0
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure