diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index 95c86883..4cf81192 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -32,9 +32,14 @@ RUN install-app frappe FROM assets_builder as erpnext_assets +ARG PAYMENTS_VERSION=develop +ARG PAYMENTS_REPO=https://github.com/frappe/payments ARG ERPNEXT_VERSION ARG ERPNEXT_REPO=https://github.com/frappe/erpnext -RUN git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \ +RUN if [ "$ERPNEXT_VERSION" = "v14"* ] || [ "$ERPNEXT_VERSION" = "develop" ]; then \ + git clone --depth 1 -b ${PAYMENTS_VERSION} ${PAYMENTS_REPO} apps/payments && install-app payments; \ + fi \ + && git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \ && install-app erpnext diff --git a/images/worker/Dockerfile b/images/worker/Dockerfile index 77fb2588..64f9be9e 100644 --- a/images/worker/Dockerfile +++ b/images/worker/Dockerfile @@ -54,10 +54,15 @@ RUN --mount=type=cache,target=/root/.cache/pip \ FROM frappe_builder as erpnext_builder +ARG PAYMENTS_VERSION=develop +ARG PAYMENTS_REPO=https://github.com/frappe/payments ARG ERPNEXT_VERSION ARG ERPNEXT_REPO=https://github.com/frappe/erpnext RUN --mount=type=cache,target=/root/.cache/pip \ - git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \ + if [ "$ERPNEXT_VERSION" = "v14"* ] || [ "$ERPNEXT_VERSION" = "develop" ]; then \ + git clone --depth 1 -b ${PAYMENTS_VERSION} ${PAYMENTS_REPO} apps/payments && install-app payments; \ + fi \ + && git clone --depth 1 -b ${ERPNEXT_VERSION} ${ERPNEXT_REPO} apps/erpnext \ && install-app erpnext