mirror of
https://github.com/frappe/frappe_docker.git
synced 2024-12-23 02:28:57 +00:00
Merge branch 'main' of https://github.com/edardev/frappe_docker
This commit is contained in:
commit
a90dc29d68
4
.github/workflows/build_bench.yml
vendored
4
.github/workflows/build_bench.yml
vendored
@ -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"
|
||||
|
||||
- name: Build and test
|
||||
uses: docker/bake-action@v5.7.0
|
||||
uses: docker/bake-action@v5.9.0
|
||||
with:
|
||||
targets: bench-test
|
||||
|
||||
@ -51,7 +51,7 @@ jobs:
|
||||
|
||||
- name: Push
|
||||
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:
|
||||
targets: bench
|
||||
push: true
|
||||
|
4
.github/workflows/docker-build-push.yml
vendored
4
.github/workflows/docker-build-push.yml
vendored
@ -56,7 +56,7 @@ jobs:
|
||||
echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Build
|
||||
uses: docker/bake-action@v5.7.0
|
||||
uses: docker/bake-action@v5.9.0
|
||||
with:
|
||||
push: true
|
||||
env:
|
||||
@ -84,6 +84,6 @@ jobs:
|
||||
|
||||
- name: Push
|
||||
if: ${{ inputs.push }}
|
||||
uses: docker/bake-action@v5.7.0
|
||||
uses: docker/bake-action@v5.9.0
|
||||
with:
|
||||
push: true
|
||||
|
@ -1,6 +1,6 @@
|
||||
# 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
|
||||
|
||||
|
@ -8,7 +8,7 @@ services:
|
||||
- traefik.http.routers.frontend-http.rule=Host(${SITES:?List of sites not set})
|
||||
|
||||
proxy:
|
||||
image: traefik:2.5
|
||||
image: traefik:v2.11
|
||||
command:
|
||||
- --providers.docker=true
|
||||
- --providers.docker.exposedbydefault=false
|
||||
|
@ -7,7 +7,7 @@ services:
|
||||
- traefik.http.routers.frontend-http.rule=HostRegexp(`{any:.+}`)
|
||||
|
||||
proxy:
|
||||
image: traefik:2.5
|
||||
image: traefik:v2.11
|
||||
command:
|
||||
- --providers.docker
|
||||
- --providers.docker.exposedbydefault=false
|
||||
|
@ -2,7 +2,7 @@ version: "3.3"
|
||||
|
||||
services:
|
||||
traefik:
|
||||
image: "traefik:v2.6"
|
||||
image: "traefik:v2.11"
|
||||
restart: unless-stopped
|
||||
labels:
|
||||
# Enable Traefik for this service, to make it available in the public network
|
||||
|
16
pwd.yml
16
pwd.yml
@ -2,7 +2,7 @@ version: "3"
|
||||
|
||||
services:
|
||||
backend:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
@ -11,7 +11,7 @@ services:
|
||||
- logs:/home/frappe/frappe-bench/logs
|
||||
|
||||
configurator:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: none
|
||||
@ -39,7 +39,7 @@ services:
|
||||
- logs:/home/frappe/frappe-bench/logs
|
||||
|
||||
create-site:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: none
|
||||
@ -89,7 +89,7 @@ services:
|
||||
- db-data:/var/lib/mysql
|
||||
|
||||
frontend:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
depends_on:
|
||||
- websocket
|
||||
deploy:
|
||||
@ -113,7 +113,7 @@ services:
|
||||
- "8080:8080"
|
||||
|
||||
queue-long:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
@ -127,7 +127,7 @@ services:
|
||||
- logs:/home/frappe/frappe-bench/logs
|
||||
|
||||
queue-short:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
@ -157,7 +157,7 @@ services:
|
||||
- redis-cache-data:/data
|
||||
|
||||
scheduler:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
@ -169,7 +169,7 @@ services:
|
||||
- logs:/home/frappe/frappe-bench/logs
|
||||
|
||||
websocket:
|
||||
image: frappe/erpnext:v15.36.1
|
||||
image: frappe/erpnext:v15.37.0
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
|
Loading…
Reference in New Issue
Block a user