From 7346016af9011f4d3c7b06dc37849abd6daa4f34 Mon Sep 17 00:00:00 2001 From: Mario Enrico Ragucci Date: Mon, 13 May 2024 19:11:29 +0200 Subject: [PATCH] getting rid of arm 32bit build --- Jenkinsfile | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e594605..0115e89 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,6 @@ pipeline { string(name: 'VERSION', defaultValue: params.VERSION ?:'v0.2.9', description: '') string(name: 'AMD64TAG', defaultValue: params.AMD64TAG ?:'amd64', description: '') string(name: 'ARM64TAG', defaultValue: params.ARM64TAG ?:'arm64', description: '') - string(name: 'ARMTAG', defaultValue: params.ARMTAG ?:'arm', description: '') booleanParam(name: 'PRODUCTION', defaultValue: params.PRODUCTION ?:false, description: '') } @@ -23,19 +22,12 @@ pipeline { --platform=linux/arm64/v8 --build-arg arch=arm64 --label version=${params.VERSION} \ --file Dockerfile . """ - - sh """ - docker buildx build --load --tag ${params.REPOSITORY}/go-tiny-mfa:${params.ARMTAG} \ - --platform=linux/arm --build-arg arch=arm --label version=${params.VERSION} \ - --file Dockerfile . - """ } } stage('Push to registry') { steps { sh "docker push ${params.REPOSITORY}/go-tiny-mfa:${params.AMD64TAG}" sh "docker push ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG}" - sh "docker push ${params.REPOSITORY}/go-tiny-mfa:${params.ARMTAG}" } } stage('Create manifests') { @@ -51,24 +43,20 @@ pipeline { docker manifest create --amend \ ${params.REPOSITORY}/go-tiny-mfa \ ${params.REPOSITORY}/go-tiny-mfa:${params.AMD64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARMTAG} - """ + ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} sh """ docker manifest create --amend \ ${params.REPOSITORY}/go-tiny-mfa:latest \ ${params.REPOSITORY}/go-tiny-mfa:${params.AMD64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARMTAG} + ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} """ sh """ docker manifest create --amend \ ${params.REPOSITORY}/go-tiny-mfa:${VERSION} \ ${params.REPOSITORY}/go-tiny-mfa:${params.AMD64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARMTAG} + ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} """ sh "docker manifest push ${params.REPOSITORY}/go-tiny-mfa" @@ -80,14 +68,12 @@ pipeline { sh "docker push ${params.REPOSITORY}/go-tiny-mfa:${params.AMD64TAG}" sh "docker push ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG}" - sh "docker push ${params.REPOSITORY}/go-tiny-mfa:${params.ARMTAG}" sh """ docker manifest create --amend \ ${params.REPOSITORY}/go-tiny-mfa:development \ ${params.REPOSITORY}/go-tiny-mfa:${params.AMD64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} \ - ${params.REPOSITORY}/go-tiny-mfa:${params.ARMTAG} + ${params.REPOSITORY}/go-tiny-mfa:${params.ARM64TAG} """ sh "docker manifest push ${params.REPOSITORY}/go-tiny-mfa:development" }