Merge pull request #17232 from GordonSmith/HPCC-29373-IMAGE_INCR

HPCC-29373 image.sh incr conflict with startup.sh Reviewed-by: Jake Smith <[email protected]> Reviewed-By: Richard Chapman <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Apr 17, 2023 · 7e1ae84 · 7e1ae84
2 parents c4b2df9 + 2c1d262
commit 7e1ae84
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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
 }
 
 finalize_platform_core_image_from_deb() {