Skip to content

Commit

Permalink
HPCC-29373 image.sh incr conflict with startup.sh
Browse files Browse the repository at this point in the history
Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Apr 14, 2023
1 parent e979d27 commit 2c1d262
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dockerfiles/image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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() {
Expand Down

0 comments on commit 2c1d262

Please sign in to comment.