mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-22 15:55:09 +00:00
Merge branch 'frappe:main' into main
This commit is contained in:
commit
3b3873cad5
9 changed files with 39 additions and 13 deletions
2
.github/workflows/app-build-image.yml
vendored
2
.github/workflows/app-build-image.yml
vendored
|
|
@ -47,7 +47,7 @@ on:
|
||||||
builder_repository:
|
builder_repository:
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: Rocket-Quack/frappe_docker
|
default: frappe/frappe_docker
|
||||||
description: "Repository that contains the Containerfile and helper scripts"
|
description: "Repository that contains the Containerfile and helper scripts"
|
||||||
builder_ref:
|
builder_ref:
|
||||||
required: false
|
required: false
|
||||||
|
|
|
||||||
12
.github/workflows/build_develop.yml
vendored
Normal file
12
.github/workflows/build_develop.yml
vendored
Normal 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
12
.github/workflows/build_stable.yml
vendored
Normal 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
2
.github/workflows/core-build-develop.yml
vendored
|
|
@ -35,7 +35,7 @@ jobs:
|
||||||
node_version: 24.12.0
|
node_version: 24.12.0
|
||||||
|
|
||||||
publish:
|
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
|
needs: test
|
||||||
uses: ./.github/workflows/core-publish-images.yml
|
uses: ./.github/workflows/core-publish-images.yml
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
4
.github/workflows/core-build-stable.yml
vendored
4
.github/workflows/core-build-stable.yml
vendored
|
|
@ -48,7 +48,7 @@ jobs:
|
||||||
node_version: 20.19.2
|
node_version: 20.19.2
|
||||||
|
|
||||||
v15_publish:
|
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
|
needs: v15_test
|
||||||
uses: ./.github/workflows/core-publish-images.yml
|
uses: ./.github/workflows/core-publish-images.yml
|
||||||
with:
|
with:
|
||||||
|
|
@ -69,7 +69,7 @@ jobs:
|
||||||
python_version: 3.14.2
|
python_version: 3.14.2
|
||||||
node_version: 24.12.0
|
node_version: 24.12.0
|
||||||
v16_publish:
|
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
|
needs: v16_test
|
||||||
uses: ./.github/workflows/core-publish-images.yml
|
uses: ./.github/workflows/core-publish-images.yml
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/02-setup/04-env-variables.md
|
# 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
|
DB_PASSWORD=123
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,7 @@ RUN useradd -ms /bin/bash frappe \
|
||||||
&& nvm install ${NODE_VERSION} \
|
&& nvm install ${NODE_VERSION} \
|
||||||
&& nvm use v${NODE_VERSION} \
|
&& nvm use v${NODE_VERSION} \
|
||||||
&& npm install -g yarn \
|
&& npm install -g yarn \
|
||||||
|
&& corepack enable pnpm \
|
||||||
&& nvm alias default v${NODE_VERSION} \
|
&& nvm alias default v${NODE_VERSION} \
|
||||||
&& rm -rf ${NVM_DIR}/.cache \
|
&& rm -rf ${NVM_DIR}/.cache \
|
||||||
&& echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
|
&& echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@ RUN useradd -ms /bin/bash frappe \
|
||||||
&& nvm install ${NODE_VERSION} \
|
&& nvm install ${NODE_VERSION} \
|
||||||
&& nvm use v${NODE_VERSION} \
|
&& nvm use v${NODE_VERSION} \
|
||||||
&& npm install -g yarn \
|
&& npm install -g yarn \
|
||||||
|
&& corepack enable pnpm \
|
||||||
&& nvm alias default v${NODE_VERSION} \
|
&& nvm alias default v${NODE_VERSION} \
|
||||||
&& rm -rf ${NVM_DIR}/.cache \
|
&& rm -rf ${NVM_DIR}/.cache \
|
||||||
&& echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
|
&& echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
|
||||||
|
|
|
||||||
16
pwd.yml
16
pwd.yml
|
|
@ -1,6 +1,6 @@
|
||||||
services:
|
services:
|
||||||
backend:
|
backend:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -16,7 +16,7 @@ services:
|
||||||
MARIADB_ROOT_PASSWORD: admin
|
MARIADB_ROOT_PASSWORD: admin
|
||||||
|
|
||||||
configurator:
|
configurator:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -45,7 +45,7 @@ services:
|
||||||
- logs:/home/frappe/frappe-bench/logs
|
- logs:/home/frappe/frappe-bench/logs
|
||||||
|
|
||||||
create-site:
|
create-site:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -99,7 +99,7 @@ services:
|
||||||
- db-data:/var/lib/mysql
|
- db-data:/var/lib/mysql
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
@ -125,7 +125,7 @@ services:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
||||||
queue-long:
|
queue-long:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -144,7 +144,7 @@ services:
|
||||||
FRAPPE_REDIS_QUEUE: redis://redis-queue:6379
|
FRAPPE_REDIS_QUEUE: redis://redis-queue:6379
|
||||||
|
|
||||||
queue-short:
|
queue-short:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -181,7 +181,7 @@ services:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
|
||||||
scheduler:
|
scheduler:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -195,7 +195,7 @@ services:
|
||||||
- logs:/home/frappe/frappe-bench/logs
|
- logs:/home/frappe/frappe-bench/logs
|
||||||
|
|
||||||
websocket:
|
websocket:
|
||||||
image: frappe/erpnext:v16.14.0
|
image: frappe/erpnext:v16.15.0
|
||||||
networks:
|
networks:
|
||||||
- frappe_network
|
- frappe_network
|
||||||
deploy:
|
deploy:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue