From 7d371cf2c3f834671913b1908d4f3feb94a56fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgaras=20Giedr=C4=97?= Date: Tue, 7 May 2019 01:17:26 +0300 Subject: [PATCH] Check if build_target var is defined in entrypoint.bash (#2042) --- .../proxysql/deb-compliant/entrypoint/entrypoint.bash | 7 ++++++- .../proxysql/rhel-compliant/entrypoint/entrypoint.bash | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash index beabbe7aa..53cb4c320 100755 --- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash +++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash @@ -26,7 +26,12 @@ else fi ${MAKE} cleanbuild ${MAKE} ${MAKEOPT} "${deps_target}" -${MAKE} ${MAKEOPT} "${build_target}" + +if [[ -z ${build_target} ]] ; then + ${MAKE} ${MAKEOPT} +else + ${MAKE} ${MAKEOPT} "${build_target}" +fi # Prepare package files and build RPM cp /root/ctl/proxysql.ctl /opt/proxysql/proxysql.ctl sed -i "s/PKG_VERSION_CURVER/${CURVER}/g" /opt/proxysql/proxysql.ctl diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash index 567664c57..b541f2e6e 100755 --- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash +++ b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash @@ -22,7 +22,12 @@ else fi ${MAKE} cleanbuild ${MAKE} ${MAKEOPT} "${deps_target}" -${MAKE} ${MAKEOPT} "${build_target}" + +if [[ -z ${build_target} ]] ; then + ${MAKE} ${MAKEOPT} +else + ${MAKE} ${MAKEOPT} "${build_target}" +fi # Prepare package files and build RPM echo "==> Packaging"