From 2c1d262f00b481d2188cbefc9ee96f13ee01d71f Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Wed, 12 Apr 2023 11:26:30 +0100 Subject: [PATCH] HPCC-29373 image.sh incr conflict with startup.sh Signed-off-by: Gordon Smith --- dockerfiles/image.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockerfiles/image.sh b/dockerfiles/image.sh index ce1917a22e2..4c4386fb0aa 100755 --- a/dockerfiles/image.sh +++ b/dockerfiles/image.sh @@ -43,8 +43,8 @@ finalize_platform_core_image() { local cmd=$2 local image_name=platform-core:$MODE echo "--- Finalize '$image_name' image ---" - if [ "$ACTION" == "incr" ] && [[ $(docker images -q hpccsystems/platform-core:$MODE-incr-prev 2> /dev/null) ]]; then - local image_name=hpccsystems/platform-core:$MODE-incr-prev + if [ "$ACTION" == "incr" ] && [[ $(docker images -q incr-core:$MODE 2> /dev/null) ]]; then + local image_name=incr-core:$MODE echo "--- Incremental '$image_name' image ---" fi CONTAINER=$(docker run -d \ @@ -56,7 +56,7 @@ finalize_platform_core_image() { docker commit $CONTAINER hpccsystems/platform-core:$GIT_BRANCH-$MODE-$crc docker stop $CONTAINER docker rm $CONTAINER - docker tag hpccsystems/platform-core:$GIT_BRANCH-$MODE-$crc hpccsystems/platform-core:$MODE-incr-prev + docker tag hpccsystems/platform-core:$GIT_BRANCH-$MODE-$crc incr-core:$MODE } clean() {