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

Merge branch 'frappe:main' into main

Browse source
This commit is contained in:
RocketQuack 2026-04-22 12:30:28 +02:00 committed by GitHub
commit 3b3873cad5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/app-build-image.yml vendored
View file

@ -47,7 +47,7 @@ on:
builder_repository:
required: false
type: string
default: Rocket-Quack/frappe_docker
default: frappe/frappe_docker
description: "Repository that contains the Containerfile and helper scripts"
builder_ref:
required: false

12
.github/workflows/build_develop.yml vendored Normal file
View file

@ -0,0 +1,12 @@
name: Legacy / Build Develop
on:
workflow_dispatch:
jobs:
delegate:
uses: ./.github/workflows/core-build-develop.yml
permissions:
contents: read
packages: write
secrets: inherit

12
.github/workflows/build_stable.yml vendored Normal file
View file

@ -0,0 +1,12 @@
name: Legacy / Build Stable
on:
workflow_dispatch:
jobs:
delegate:
uses: ./.github/workflows/core-build-stable.yml
permissions:
contents: read
packages: write
secrets: inherit

2
.github/workflows/core-build-develop.yml vendored
View file

@ -35,7 +35,7 @@ jobs:
node_version: 24.12.0
publish:
if: ${{ contains(fromJSON('["frappe/frappe_docker","Rocket-Quack/frappe_docker"]'), github.repository) && github.event_name != 'pull_request' }}
if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
needs: test
uses: ./.github/workflows/core-publish-images.yml
with:

4
.github/workflows/core-build-stable.yml vendored
View file

@ -48,7 +48,7 @@ jobs:
node_version: 20.19.2
v15_publish:
if: ${{ contains(fromJSON('["frappe/frappe_docker","Rocket-Quack/frappe_docker"]'), github.repository) && github.event_name != 'pull_request' }}
if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
needs: v15_test
uses: ./.github/workflows/core-publish-images.yml
with:
@ -69,7 +69,7 @@ jobs:
python_version: 3.14.2
node_version: 24.12.0
v16_publish:
if: ${{ contains(fromJSON('["frappe/frappe_docker","Rocket-Quack/frappe_docker"]'), github.repository) && github.event_name != 'pull_request' }}
if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
needs: v16_test
uses: ./.github/workflows/core-publish-images.yml
with:

2
example.env
View file

@ -1,6 +1,6 @@
# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/02-setup/04-env-variables.md
ERPNEXT_VERSION=v16.14.0
ERPNEXT_VERSION=v16.15.0
DB_PASSWORD=123

1
images/custom/Containerfile
View file

@ -49,6 +49,7 @@ RUN useradd -ms /bin/bash frappe \
&& nvm install ${NODE_VERSION} \
&& nvm use v${NODE_VERSION} \
&& npm install -g yarn \
&& corepack enable pnpm \
&& nvm alias default v${NODE_VERSION} \
&& rm -rf ${NVM_DIR}/.cache \
&& echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \

1
images/production/Containerfile
View file

@ -45,6 +45,7 @@ RUN useradd -ms /bin/bash frappe \
&& nvm install ${NODE_VERSION} \
&& nvm use v${NODE_VERSION} \
&& npm install -g yarn \
&& corepack enable pnpm \
&& nvm alias default v${NODE_VERSION} \
&& rm -rf ${NVM_DIR}/.cache \
&& echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \

16
pwd.yml
View file

@ -1,6 +1,6 @@
services:
backend:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
deploy:
@ -16,7 +16,7 @@ services:
MARIADB_ROOT_PASSWORD: admin
configurator:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
deploy:
@ -45,7 +45,7 @@ services:
- logs:/home/frappe/frappe-bench/logs
create-site:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
deploy:
@ -99,7 +99,7 @@ services:
- db-data:/var/lib/mysql
frontend:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
depends_on:
@ -125,7 +125,7 @@ services:
- "8080:8080"
queue-long:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
deploy:
@ -144,7 +144,7 @@ services:
FRAPPE_REDIS_QUEUE: redis://redis-queue:6379
queue-short:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
deploy:
@ -181,7 +181,7 @@ services:
condition: on-failure
scheduler:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
deploy:
@ -195,7 +195,7 @@ services:
- logs:/home/frappe/frappe-bench/logs
websocket:
image: frappe/erpnext:v16.14.0
image: frappe/erpnext:v16.15.0
networks:
- frappe_network
deploy: