diff --git a/example.env b/example.env index ee8d44ab..2a656035 100644 --- a/example.env +++ b/example.env @@ -1,8 +1,13 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md +BENCH_REPO=https://github.com/frappe/bench.git +BENCH_BRANCH=develop + +FRAPPE_REPO=https://github.com/frappe/frappe FRAPPE_VERSION=v13.30.0 # Only with ERPNext override +ERPNEXT_REPO=https://github.com/frappe/erpnext ERPNEXT_VERSION=v13.31.1 DB_PASSWORD=123 diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index a963425e..7cd46a0a 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -2,8 +2,8 @@ FROM debian:bullseye-slim as bench LABEL author=frappé -ARG GIT_REPO=https://github.com/frappe/bench.git -ARG GIT_BRANCH=develop +ARG BENCH_REPO +ARG BENCH_BRANCH=develop RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ @@ -97,7 +97,7 @@ RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \ ENV PATH /home/frappe/.local/bin:$PATH # Skip editable-bench warning # https://github.com/frappe/bench/commit/20560c97c4246b2480d7358c722bc9ad13606138 -RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ +RUN git clone ${BENCH_REPO} --depth 1 -b ${BENCH_BRANCH} .bench \ && pip install --user -e .bench \ && echo "export PATH=/home/frappe/.local/bin:\$PATH" >>/home/frappe/.bashrc \ && echo "export BENCH_DEVELOPER=1" >>/home/frappe/.bashrc diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index 310ab14c..4050fefb 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -14,7 +14,7 @@ RUN mkdir -p sites/assets /out/assets \ && echo frappe >sites/apps.txt ARG FRAPPE_VERSION -ARG FRAPPE_REPO=https://github.com/frappe/frappe +ARG FRAPPE_REPO # Install development node modules RUN git clone --depth 1 -b ${FRAPPE_VERSION} ${FRAPPE_REPO} apps/frappe \ && yarn --cwd apps/frappe \ diff --git a/images/socketio/Dockerfile b/images/socketio/Dockerfile index bf63380c..168e4dcd 100644 --- a/images/socketio/Dockerfile +++ b/images/socketio/Dockerfile @@ -1,7 +1,7 @@ FROM alpine/git as builder ARG FRAPPE_VERSION -ARG FRAPPE_REPO=https://github.com/frappe/frappe +ARG FRAPPE_REPO RUN git clone --depth 1 -b ${FRAPPE_VERSION} ${FRAPPE_REPO} /opt/frappe diff --git a/images/worker/Dockerfile b/images/worker/Dockerfile index 77fb2588..f8062ec6 100644 --- a/images/worker/Dockerfile +++ b/images/worker/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get update \ FROM build_deps as frappe_builder ARG FRAPPE_VERSION -ARG FRAPPE_REPO=https://github.com/frappe/frappe +ARG FRAPPE_REPO RUN --mount=type=cache,target=/root/.cache/pip \ git clone --depth 1 -b ${FRAPPE_VERSION} ${FRAPPE_REPO} apps/frappe \ && install-app frappe \ @@ -55,7 +55,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ FROM frappe_builder as erpnext_builder ARG ERPNEXT_VERSION -ARG ERPNEXT_REPO=https://github.com/frappe/erpnext +ARG ERPNEXT_REPO RUN --mount=type=cache,target=/root/.cache/pip \ git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \ && install-app erpnext