CI Changes, docker image tag changes and manifests

Author: jc21

Jenkinsfile

@@ -323,41 +323,40 @@ pipeline {
       }
     }
     // ========================
-    // master cleanup
+    // cleanup
     // ========================
-    parallel {
-      // ========================
-      // amd64
-      // ========================
-      stage('Latest cleanup') {
-        when {
-          branch 'master'
-        }
-        steps {
-          ansiColor('xterm') {
-            sh 'docker rmi jc21/${IMAGE}:latest jc21/${IMAGE}:latest-${AMD64_TAG} jc21/${IMAGE}:latest-${ARM64_TAG} jc21/${IMAGE}:latest-${ARMV7_TAG}'
-            sh 'docker rmi jc21/${IMAGE}:${MAJOR_VERSION}-${AMD64_TAG} jc21/${IMAGE}:${MAJOR_VERSION}-${ARM64_TAG} jc21/${IMAGE}:${MAJOR_VERSION}-${ARMV7_TAG}'
-            sh 'docker rmi jc21/${IMAGE}:${TAG_VERSION}-${AMD64_TAG} jc21/${IMAGE}:${TAG_VERSION}-${ARM64_TAG} jc21/${IMAGE}:${TAG_VERSION}-${ARMV7_TAG}'
+    stage {
+      parallel {
+        stage('Latest cleanup') {
+          when {
+            branch 'master'
           }
-        }
-      }
-      stage('Develop cleanup') {
-        when {
-          branch 'develop'
-        }
-        steps {
-          ansiColor('xterm') {
-            sh 'docker rmi jc21/${IMAGE}:develop jc21/${IMAGE}:develop-${AMD64_TAG}'
+          steps {
+            ansiColor('xterm') {
+              sh 'docker rmi jc21/${IMAGE}:latest jc21/${IMAGE}:latest-${AMD64_TAG} jc21/${IMAGE}:latest-${ARM64_TAG} jc21/${IMAGE}:latest-${ARMV7_TAG}'
+              sh 'docker rmi jc21/${IMAGE}:${MAJOR_VERSION}-${AMD64_TAG} jc21/${IMAGE}:${MAJOR_VERSION}-${ARM64_TAG} jc21/${IMAGE}:${MAJOR_VERSION}-${ARMV7_TAG}'
+              sh 'docker rmi jc21/${IMAGE}:${TAG_VERSION}-${AMD64_TAG} jc21/${IMAGE}:${TAG_VERSION}-${ARM64_TAG} jc21/${IMAGE}:${TAG_VERSION}-${ARMV7_TAG}'
+            }
           }
         }
-      }
-      stage('PR cleanup') {
-        when {
-          changeRequest()
+        stage('Develop cleanup') {
+          when {
+            branch 'develop'
+          }
+          steps {
+            ansiColor('xterm') {
+              sh 'docker rmi jc21/${IMAGE}:develop jc21/${IMAGE}:develop-${AMD64_TAG}'
+            }
+          }
         }
-        steps {
-          ansiColor('xterm') {
-            sh 'docker rmi jc21/${IMAGE}:github-${BRANCH_LOWER}-${AMD64_TAG}'
+        stage('PR cleanup') {
+          when {
+            changeRequest()
+          }
+          steps {
+            ansiColor('xterm') {
+              sh 'docker rmi jc21/${IMAGE}:github-${BRANCH_LOWER}-${AMD64_TAG}'
+            }
           }
         }
       }