From fac0ce5137a6fb1af3dd5e670fea915872663a9c Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 2 Aug 2022 05:40:13 +0530 Subject: [PATCH] fix: docker build condition for v14 --- images/nginx/Dockerfile | 2 +- images/worker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index 4cf81192..eb4da5cc 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -36,7 +36,7 @@ ARG PAYMENTS_VERSION=develop ARG PAYMENTS_REPO=https://github.com/frappe/payments ARG ERPNEXT_VERSION ARG ERPNEXT_REPO=https://github.com/frappe/erpnext -RUN if [ "$ERPNEXT_VERSION" = "v14"* ] || [ "$ERPNEXT_VERSION" = "develop" ]; then \ +RUN if [ -z "${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 \ diff --git a/images/worker/Dockerfile b/images/worker/Dockerfile index 431c0a52..40c09945 100644 --- a/images/worker/Dockerfile +++ b/images/worker/Dockerfile @@ -59,7 +59,7 @@ 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 \ - if [ "$ERPNEXT_VERSION" = "v14"* ] || [ "$ERPNEXT_VERSION" = "develop" ]; then \ + if [ -z "${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 \