Merge pull request #10064 from EOSIO/sa/fix-docker-publish-tags-dev

[develop] Fix docker steps on tagged builds.

.cicd/create-docker-from-binary.sh

@@ -33,20 +33,22 @@ for REG in ${EOSIO_REGS[@]}; do
     echo -e "$ Pushing Images: \n$DOCKER_PUSH_COMMIT \n$DOCKER_PUSH_BRANCH"
     eval $DOCKER_PUSH_COMMIT 
     eval $DOCKER_PUSH_BRANCH
-    CLEAN_IMAGE_COMMIT="docker rmi $REG:$BUILDKITE_COMMIT"
-    CLEAN_IMAGE_BRANCH="docker rmi $REG:$SANITIZED_BRANCH"
+    CLEAN_IMAGE_COMMIT="docker rmi $REG:$BUILDKITE_COMMIT || :"
+    CLEAN_IMAGE_BRANCH="docker rmi $REG:$SANITIZED_BRANCH || :"
     echo -e "Cleaning Up: \n$CLEAN_IMAGE_COMMIT \n$CLEAN_IMAGE_BRANCH$"
     eval $CLEAN_IMAGE_COMMIT 
     eval $CLEAN_IMAGE_BRANCH
     if [[ ! -z "$SANITIZED_TAG" ]]; then
-        DOCKER_TAG="docker tag eosio_image $REG:$SANITIZED_TAG"
-        DOCKER_REM="docker rmi $REG:$SANITIZED_TAG"
+        DOCKER_TAG="docker tag eosio_image:$BUILD_TAG $REG:$SANITIZED_TAG"
+        DOCKER_PUSH_TAG="docker push $REG:$SANITIZED_TAG"
+        DOCKER_REM="docker rmi $REG:$SANITIZED_TAG || :"
         echo -e "$ \n Tagging Image: \n$DOCKER_TAG \n Cleaning Up: \n$DOCKER_REM"
-        eval $DOCKER_TAG 
+        eval $DOCKER_TAG
+        eval $DOCKER_PUSH_TAG
         eval $DOCKER_REM
     fi
 done
 
-DOCKER_GEN="docker rmi eosio_image:$BUILD_TAG"
+DOCKER_GEN="docker rmi eosio_image:$BUILD_TAG || :"
 echo "Clean up base image"
 eval $DOCKER_GEN