From f74ff3cf627863826eba00c5c7568e0bebe6648e Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 29 Aug 2023 09:33:54 +0530 Subject: [PATCH] ci: changes for version 15 --- .github/workflows/build_develop.yml | 4 ++-- .github/workflows/build_stable.yml | 36 ++++++++++++++--------------- development/apps-example.json | 2 +- development/installer.py | 4 ++-- docker-bake.hcl | 4 ++-- images/bench/Dockerfile | 14 +++++------ images/custom/Containerfile | 8 +++---- images/production/Containerfile | 10 ++++---- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index 97ed9a88..e4d303d7 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -26,8 +26,8 @@ jobs: repo: erpnext version: develop push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - python_version: 3.11.4 - node_version: 18.16.1 + python_version: 3.11.5 + node_version: 18.18.0 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index ec0f7b68..c91f74d7 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -30,26 +30,26 @@ on: workflow_dispatch: jobs: - v13: - uses: ./.github/workflows/docker-build-push.yml - with: - repo: erpnext - version: "13" - push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - python_version: 3.9.17 - node_version: 14.21.3 - secrets: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - v14: uses: ./.github/workflows/docker-build-push.yml with: repo: erpnext version: "14" push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - python_version: 3.10.12 - node_version: 16.20.1 + python_version: 3.10.13 + node_version: 16.20.2 + secrets: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + + v15: + uses: ./.github/workflows/docker-build-push.yml + with: + repo: erpnext + version: "15" + push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + python_version: 3.11.5 + node_version: 18.18.0 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: name: Update example.env and pwd.yml runs-on: ubuntu-latest if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - needs: v14 + needs: v15 steps: - name: Checkout @@ -70,7 +70,7 @@ jobs: python-version: "3.10" - name: Get latest versions - run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 14 + run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 15 - name: Update run: | @@ -96,7 +96,7 @@ jobs: name: Release Helm runs-on: ubuntu-latest if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - needs: v14 + needs: v15 steps: - name: Setup deploy key @@ -113,4 +113,4 @@ jobs: run: | git clone git@github.com:frappe/helm.git && cd helm pip install -r release_wizard/requirements.txt - ./release_wizard/wizard 14 patch --remote origin --ci + ./release_wizard/wizard 15 patch --remote origin --ci diff --git a/development/apps-example.json b/development/apps-example.json index f73d9278..513d3d10 100644 --- a/development/apps-example.json +++ b/development/apps-example.json @@ -1,6 +1,6 @@ [ { "url": "https://github.com/frappe/erpnext.git", - "branch": "version-14" + "branch": "version-15" } ] diff --git a/development/installer.py b/development/installer.py index 1d59e874..ed0c41ce 100755 --- a/development/installer.py +++ b/development/installer.py @@ -72,8 +72,8 @@ def get_args_parser(): "--frappe-branch", action="store", type=str, - help="frappe repo to use, default: version-14", # noqa: E501 - default="version-14", + help="frappe repo to use, default: version-15", # noqa: E501 + default="version-15", ) parser.add_argument( "-p", diff --git a/docker-bake.hcl b/docker-bake.hcl index a217c6ea..f5217422 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -6,10 +6,10 @@ variable "REGISTRY_USER" { } variable PYTHON_VERSION { - default = "3.11.4" + default = "3.11.5" } variable NODE_VERSION { - default = "18.16.1" + default = "18.18.0" } variable "FRAPPE_VERSION" { diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index cc5ade6e..1c78dbcd 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -95,9 +95,9 @@ USER frappe WORKDIR /home/frappe # Install Python via pyenv -ENV PYTHON_VERSION_V13=3.9.17 -ENV PYTHON_VERSION_DEVELOP=3.11.4 -ENV PYTHON_VERSION=3.10.12 +ENV PYTHON_VERSION_V14=3.10.13 +ENV PYTHON_VERSION_DEVELOP=3.11.5 +ENV PYTHON_VERSION=3.11.5 ENV PYENV_ROOT /home/frappe/.pyenv ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH @@ -125,13 +125,13 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ && echo "export BENCH_DEVELOPER=1" >>/home/frappe/.bashrc # Install Node via nvm -ENV NODE_VERSION_13=14.21.3 -ENV NODE_VERSION_DEVELOP=18.12.0 -ENV NODE_VERSION=16.20.1 +ENV NODE_VERSION_14=16.20.2 +ENV NODE_VERSION_DEVELOP=18.18.0 +ENV NODE_VERSION=18.18.0 ENV NVM_DIR /home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} -RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \ +RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ && nvm install ${NODE_VERSION_13} \ && nvm use v${NODE_VERSION_13} \ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index e9200833..9d19f266 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.11.4 +ARG PYTHON_VERSION=3.11.5 ARG DEBIAN_BASE=bookworm 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_DISTRO=bookworm -ARG NODE_VERSION=18.16.1 +ARG NODE_VERSION=18.18.0 ENV NVM_DIR=/home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -36,7 +36,7 @@ RUN useradd -ms /bin/bash frappe \ jq \ # NodeJS && mkdir -p ${NVM_DIR} \ - && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash \ + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ && nvm install ${NODE_VERSION} \ && nvm use v${NODE_VERSION} \ @@ -103,7 +103,7 @@ RUN if [ -n "${APPS_JSON_BASE64}" ]; then \ USER frappe -ARG FRAPPE_BRANCH=version-14 +ARG FRAPPE_BRANCH=version-15 ARG FRAPPE_PATH=https://github.com/frappe/frappe RUN export APP_INSTALL_ARGS="" && \ if [ -n "${APPS_JSON_BASE64}" ]; then \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 2add02a0..c79e7fc3 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -1,10 +1,10 @@ -ARG PYTHON_VERSION=3.11.4 +ARG PYTHON_VERSION=3.11.5 ARG DEBIAN_BASE=bookworm FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm -ARG NODE_VERSION=18.16.1 +ARG NODE_VERSION=18.18.0 ENV NVM_DIR=/home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -33,7 +33,7 @@ RUN useradd -ms /bin/bash frappe \ jq \ # NodeJS && mkdir -p ${NVM_DIR} \ - && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash \ + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ && nvm install ${NODE_VERSION} \ && nvm use v${NODE_VERSION} \ @@ -95,10 +95,10 @@ RUN apt-get update \ USER frappe -ARG FRAPPE_BRANCH=version-14 +ARG FRAPPE_BRANCH=version-15 ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG ERPNEXT_REPO=https://github.com/frappe/erpnext -ARG ERPNEXT_BRANCH=version-14 +ARG ERPNEXT_BRANCH=version-15 RUN bench init \ --frappe-branch=${FRAPPE_BRANCH} \ --frappe-path=${FRAPPE_PATH} \