mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-23 00:05:09 +00:00
ci: fix develop builds
This commit is contained in:
parent
e4a97a9e11
commit
debec8aaf2
5 changed files with 10 additions and 9 deletions
4
.github/workflows/build_develop.yml
vendored
4
.github/workflows/build_develop.yml
vendored
|
|
@ -26,8 +26,8 @@ jobs:
|
||||||
repo: erpnext
|
repo: erpnext
|
||||||
version: develop
|
version: develop
|
||||||
push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
|
push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
|
||||||
python_version: 3.11.6
|
python_version: 3.13.3
|
||||||
node_version: 18.18.2
|
node_version: 20.19.0
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,8 @@ Each Frappe/ERPNext release triggers new stable images builds as well as bump to
|
||||||
In case of new release of Debian. e.g. bullseye to bookworm. Change following files:
|
In case of new release of Debian. e.g. bullseye to bookworm. Change following files:
|
||||||
|
|
||||||
- `images/erpnext/Containerfile` and `images/custom/Containerfile`: Change the files to use new debian release, make sure new python version tag that is available on new debian release image. e.g. 3.9.9 (bullseye) to 3.9.17 (bookworm) or 3.10.5 (bullseye) to 3.10.12 (bookworm). Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
|
- `images/erpnext/Containerfile` and `images/custom/Containerfile`: Change the files to use new debian release, make sure new python version tag that is available on new debian release image. e.g. 3.9.9 (bullseye) to 3.9.17 (bookworm) or 3.10.5 (bullseye) to 3.10.12 (bookworm). Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
|
||||||
- `images/bench/Dockerfile`: Change the files to use new debian release. Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
|
- `images/bench/Dockerfile`: Change the file to use new debian release. Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly.
|
||||||
|
- `docker-bake.hcl`: Change the default Python and NodeJS versions in this file.
|
||||||
|
|
||||||
Change following files on release of ERPNext
|
Change following files on release of ERPNext
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,10 @@ variable "REGISTRY_USER" {
|
||||||
}
|
}
|
||||||
|
|
||||||
variable PYTHON_VERSION {
|
variable PYTHON_VERSION {
|
||||||
default = "3.11.6"
|
default = "3.13.3"
|
||||||
}
|
}
|
||||||
variable NODE_VERSION {
|
variable NODE_VERSION {
|
||||||
default = "18.18.2"
|
default = "20.19.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "FRAPPE_VERSION" {
|
variable "FRAPPE_VERSION" {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
ARG PYTHON_VERSION=3.11.6
|
ARG PYTHON_VERSION=3.13.3
|
||||||
ARG DEBIAN_BASE=bookworm
|
ARG DEBIAN_BASE=bookworm
|
||||||
FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
|
FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
|
||||||
|
|
||||||
|
|
@ -7,7 +7,7 @@ COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
|
||||||
|
|
||||||
ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
|
ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
|
||||||
ARG WKHTMLTOPDF_DISTRO=bookworm
|
ARG WKHTMLTOPDF_DISTRO=bookworm
|
||||||
ARG NODE_VERSION=18.18.2
|
ARG NODE_VERSION=20.19.0
|
||||||
ENV NVM_DIR=/home/frappe/.nvm
|
ENV NVM_DIR=/home/frappe/.nvm
|
||||||
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
ARG PYTHON_VERSION=3.11.6
|
ARG PYTHON_VERSION=3.13.3
|
||||||
ARG DEBIAN_BASE=bookworm
|
ARG DEBIAN_BASE=bookworm
|
||||||
FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
|
FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
|
||||||
|
|
||||||
ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
|
ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
|
||||||
ARG WKHTMLTOPDF_DISTRO=bookworm
|
ARG WKHTMLTOPDF_DISTRO=bookworm
|
||||||
ARG NODE_VERSION=18.18.2
|
ARG NODE_VERSION=20.19.0
|
||||||
ENV NVM_DIR=/home/frappe/.nvm
|
ENV NVM_DIR=/home/frappe/.nvm
|
||||||
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue