Updated docker tagging process

Author: Kendar

scripts/libs/docker.bat

@@ -45,29 +45,36 @@ goto :eof
   set IMAGE_NAME=%~1
   set VERSION_NUMBER=%~2
 
+  docker tag %IMAGE_NAME% %LOGIN%/%IMAGE_NAME%
+
   if NOT "%VERSION_NUMBER%"=="%VERSION_NUMBER:SNAPSHOT=%" (
     REM if [[ "%VERSION_NUMBER%" == *"snapshot"* ]] ;then
-    echo Removing tag %IMAGE_NAME%
-    call:docker_remove_tag "%IMAGE_NAME%" snapshot
-    call:docker_remove_tag "%IMAGE_NAME%" "%VERSION_NUMBER%"
-    echo Pushing image tag %IMAGE_NAME%
-    call docker push %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER%
-    call docker push %DOCKER_ORG%/%IMAGE_NAME%:snapshot
+    echo Pushing snapshot base image tag %IMAGE_NAME%
+    call docker push %DOCKER_ORG%/%IMAGE_NAME%
+
     echo Tagging image %IMAGE_NAME%
-    call docker tag %IMAGE_NAME% %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER%
-    call docker tag %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER% %DOCKER_ORG%/%IMAGE_NAME%:snapshot
-  ) else (
-    echo Pushing image tag %IMAGE_NAME%
+    call docker tag %DOCKER_ORG%/%IMAGE_NAME% %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER%
     call docker push %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER%
-    call docker push %DOCKER_ORG%/%IMAGE_NAME%:latest
+
+    call docker tag %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER% %DOCKER_ORG%/%IMAGE_NAME%:snapshot
     call docker push %DOCKER_ORG%/%IMAGE_NAME%:snapshot
+  ) else (
+    echo Pushing base image tag %IMAGE_NAME%
+    call docker push %DOCKER_ORG%/%IMAGE_NAME%
+
     echo Tagging image %IMAGE_NAME%
-    call docker tag %IMAGE_NAME% %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER%
+    call docker tag %DOCKER_ORG%/%IMAGE_NAME% %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER%
+    call docker push %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER%
+
     call docker tag %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER% %DOCKER_ORG%/%IMAGE_NAME%:latest
+    call docker push %DOCKER_ORG%/%IMAGE_NAME%:latest
+
     call docker tag %DOCKER_ORG%/%IMAGE_NAME%:v%VERSION_NUMBER% %DOCKER_ORG%/%IMAGE_NAME%:snapshot
+    call docker push %DOCKER_ORG%/%IMAGE_NAME%:snapshot
   )
 goto :eof
 
 
+
 :exit
 exit /b