diff --git a/Dockerfile b/Dockerfile index d4f53b3..7e170bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,14 @@ LABEL Vendor="Internet2" \ ImageOS=centos7 \ Version=$VERSION + + + +ARG TARGETPLATFORM +ENV TARGETPLATFORM=linux/amd64 + + + ######################### ### BEGIN IMAGE BUILD ### ######################### diff --git a/Jenkinsfile b/Jenkinsfile index 20644dd..407cd81 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,8 +59,9 @@ pipeline { 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 --push --platform linux/arm64,linux/amd64 -t i2incommon/shib-idp:$tag ." + // 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 ." // test the environment // sh 'cd test-compose && ./compose.sh' // bring down after testing