epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-23 00:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'frappe:main' into main

Browse source
This commit is contained in:
tobehn 2025-03-16 13:28:31 +01:00 committed by GitHub
commit f6298496fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/docker-build-push.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
services: services:
registry: registry:
image: registry:2 image: docker.io/registry:2
ports: ports:
- 5000:5000 - 5000:5000
strategy: strategy:
@ -45,8 +45,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Set up QEMU - name: Setup QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
with:
image: tonistiigi/binfmt:latest
platforms: all
- name: Setup Buildx - name: Setup Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
@ -95,3 +98,4 @@ jobs:
uses: docker/bake-action@v6.5.0 uses: docker/bake-action@v6.5.0
with: with:
push: true push: true
set: "*.platform=linux/amd64,linux/arm64"

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.53.4 ERPNEXT_VERSION=v15.54.4
DB_PASSWORD=123 DB_PASSWORD=123

1
images/bench/Dockerfile
View file

@ -47,6 +47,7 @@ RUN apt-get update \
libsasl2-dev \ libsasl2-dev \
libtiff5-dev \ libtiff5-dev \
libwebp-dev \ libwebp-dev \
pkg-config \
redis-tools \ redis-tools \
rlwrap \ rlwrap \
tk8.6-dev \ tk8.6-dev \

1
images/custom/Containerfile
View file

@ -94,6 +94,7 @@ RUN apt-get update \
libsasl2-dev \ libsasl2-dev \
libtiff5-dev \ libtiff5-dev \
libwebp-dev \ libwebp-dev \
pkg-config \
redis-tools \ redis-tools \
rlwrap \ rlwrap \
tk8.6-dev \ tk8.6-dev \

1
images/production/Containerfile
View file

@ -86,6 +86,7 @@ RUN apt-get update \
libsasl2-dev \ libsasl2-dev \
libtiff5-dev \ libtiff5-dev \
libwebp-dev \ libwebp-dev \
pkg-config \
redis-tools \ redis-tools \
rlwrap \ rlwrap \
tk8.6-dev \ tk8.6-dev \

16
pwd.yml
View file

@ -2,7 +2,7 @@ version: "3"
services: services:
backend: backend:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -18,7 +18,7 @@ services:
MARIADB_ROOT_PASSWORD: admin MARIADB_ROOT_PASSWORD: admin
configurator: configurator:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -47,7 +47,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
create-site: create-site:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -102,7 +102,7 @@ services:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
frontend: frontend:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
depends_on: depends_on:
@ -128,7 +128,7 @@ services:
- "8080:8080" - "8080:8080"
queue-long: queue-long:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -144,7 +144,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
queue-short: queue-short:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -178,7 +178,7 @@ services:
condition: on-failure condition: on-failure
scheduler: scheduler:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -192,7 +192,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
websocket: websocket:
image: frappe/erpnext:v15.53.4 image: frappe/erpnext:v15.54.4
networks: networks:
- frappe_network - frappe_network
deploy: deploy: