#13 push image with both tags

Jenkinsfile

@@ -7,18 +7,28 @@ pipeline {
         DOCKER_REGISTRY_URL = 'https://git.gerhardt.io'
         OWNER = 'amarillo'
         IMAGE_NAME = 'amarillo'
-        TAG = 'latest'
+        AMARILLO_DISTRIBUTION = '0.1'
+        TAG = "${AMARILLO_DISTRIBUTION}.${BUILD_NUMBER}"
         PLUGINS = 'amarillo-metrics amarillo-enhancer'
         DEPLOY_WEBHOOK_URL = 'http://amarillo.mfdz.de:8888/mitanand'
         DEPLOY_SECRET = credentials('AMARILLO-JENKINS-DEPLOY-SECRET')
     }
     stages {
+        stage('Echo environment variables'){
+            steps {
+                echo "BRANCH_NAME: ${BRANCH_NAME}"
+                echo "JOB_NAME: ${JOB_NAME}"
+                echo "BRANCH_IS_PRIMARY ${BRANCH_IS_PRIMARY}"
+                echo "TAG_NAME: ${TAG_NAME}"
+            }
+        }
         stage('Build docker image') {
             steps {
                 echo 'Building image'
                 script {
                     docker.build("${OWNER}/${IMAGE_NAME}:${TAG}",
-                     "--build-arg='PACKAGE_REGISTRY_URL=${PLUGINS_REPO_URL}' --build-arg='PLUGINS=${PLUGINS}' --secret id=AMARILLO_REGISTRY_CREDENTIALS,env=GITEA_CREDS .")
+                    //--no-cache to make sure plugins are updated
+                     "-t ${OWNER}/${IMAGE_NAME}:latest --no-cache --build-arg='PACKAGE_REGISTRY_URL=${PLUGINS_REPO_URL}' --build-arg='PLUGINS=${PLUGINS}' --secret id=AMARILLO_REGISTRY_CREDENTIALS,env=GITEA_CREDS .")
                 }
             }
         }
@@ -43,7 +53,9 @@ pipeline {
                 echo 'Pushing image to registry'
                 script {
                     docker.withRegistry(DOCKER_REGISTRY_URL, 'AMARILLO-JENKINS-GITEA-USER'){
-                        docker.image("${OWNER}/${IMAGE_NAME}:${TAG}").push()
+                        def image = docker.image("${OWNER}/${IMAGE_NAME}:${TAG}")
+                        image.push()
+                        image.push('latest')
                     }
                 }
             }