From e8ab3c2d998307805de8a684e70a41b815d471d6 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 2 Nov 2022 20:25:23 +0000 Subject: [PATCH] update rocky linux to 8.6 --- Dockerfile | 10 +--------- Jenkinsfile | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9c5315..2ccff3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETPLATFORM rockylinux:8 +FROM --platform=$TARGETPLATFORM rockylinux:8.6 ######################## ### VERSION SETTINGS ### @@ -42,14 +42,6 @@ LABEL Vendor="Internet2" \ ImageOS=centos7 \ Version=$VERSION - - - -ARG TARGETPLATFORM -ENV TARGETPLATFORM=linux/armv8 - - - ######################### ### BEGIN IMAGE BUILD ### ######################### diff --git a/Jenkinsfile b/Jenkinsfile index 1747f47..20644dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -61,7 +61,6 @@ pipeline { 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/arm64 -t i2incommon/shib-idp:$tag ." // test the environment // sh 'cd test-compose && ./compose.sh' // bring down after testing