Test to simplify config

1 files changed, 3 insertions, 28 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index fa01ddd..561ed3d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,37 +63,12 @@ pipeline {
 	            --build-arg APP_VERSION=${APP_VERSION} \
 	            --build-arg ALPINE_VERSION=${ALPINE_VERSION} \
               -t ${IMAGE_NAME}:${GIT_SHA} \
-              -t ${IMAGE_NAME}:${APP_VERSION} \
-              -t ${IMAGE_NAME}:${APP_VERSION}-alpine${ALPINE_VERSION} \
-              -t ${IMAGE_NAME}:latest \
-	            --push \
-              .
-              .
-          '''
-        }
-      }
-    }
-
-    stage('Docker github build') {
-      steps {
-        withCredentials([usernamePassword(
-            credentialsId: 'docker-hub',
-            usernameVariable: 'DOCKER_USER',
-            passwordVariable: 'DOCKER_PASS'
-        )]) {
-          sh '''
-            docker version
-            docker buildx version
-            docker buildx ls | grep -q multiarch || docker buildx create --name multiarch --use --bootstrap
-            echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-
-            DOCKER_BUILDKIT=1 docker buildx build \
-              --platform ${PLATFORMS} \
-	            --build-arg APP_VERSION=${APP_VERSION} \
-	            --build-arg ALPINE_VERSION=${ALPINE_VERSION} \
               -t ${DOCKER_HUB}:${GIT_SHA} \
+              -t ${IMAGE_NAME}:${APP_VERSION} \
               -t ${DOCKER_HUB}:${APP_VERSION} \
+              -t ${IMAGE_NAME}:${APP_VERSION}-alpine${ALPINE_VERSION} \
               -t ${DOCKER_HUB}:${APP_VERSION}-alpine${ALPINE_VERSION} \
+              -t ${IMAGE_NAME}:latest \
               -t ${DOCKER_HUB}:latest \
 	            --push \
               .