From 884176a2085af71a4fee2d0d61c85a02dafd318d Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 2 Nov 2022 16:05:07 +0000 Subject: [PATCH] test --- Dockerfile | 4 ++-- Jenkinsfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b76886a..63b2242 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 rockylinux/rockylinux:8.6 +FROM --platform=linux/arm64 rockylinux/rockylinux:8.6 ######################## ### VERSION SETTINGS ### @@ -46,7 +46,7 @@ LABEL Vendor="Internet2" \ ARG TARGETPLATFORM -ENV TARGETPLATFORM=linux/amd64 +ENV TARGETPLATFORM=linux/arm64 diff --git a/Jenkinsfile b/Jenkinsfile index 407cd81..85cb44d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,10 +58,10 @@ pipeline { // sh 'docker buildx create --use --name multiarch --append' sh 'docker buildx inspect --bootstrap' sh 'docker buildx ls' - sh 'docker buildx build --platform linux/amd64 -t shib-idp .' - // sh 'docker buildx build --platform linux/arm64 -t shib-idp:arm64 .' + // sh 'docker buildx build --platform linux/amd64 -t shib-idp .' + sh 'docker buildx build --platform linux/arm64 -t shib-idp:arm64 .' //sh "docker buildx build --push --platform linux/arm64,linux/amd64 -t i2incommon/shib-idp:$tag ." - sh "docker buildx build --push --platform linux/amd64 -t i2incommon/shib-idp:$tag ." + sh "docker buildx build --push --platform linux/arm64 -t i2incommon/shib-idp:$tag ." // test the environment // sh 'cd test-compose && ./compose.sh' // bring down after testing