From d71572c001ec1cbcfab90525acaa5ccc86a426fd Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Mon, 11 Dec 2023 19:30:23 +0000 Subject: [PATCH] reverted dockerfile pins --- build-s2i-python-kopf/Dockerfile | 2 +- build-s2i-python-kopf/examples/kopf-simple/Dockerfile | 2 +- .../examples/openshift-template-deployer/Dockerfile | 2 +- jenkins-agents/jenkins-agent-ansible/Dockerfile | 2 +- jenkins-agents/jenkins-agent-arachni/Dockerfile | 2 +- jenkins-agents/jenkins-agent-argocd/Dockerfile | 2 +- jenkins-agents/jenkins-agent-conftest/Dockerfile | 2 +- jenkins-agents/jenkins-agent-cosign/Dockerfile | 2 +- jenkins-agents/jenkins-agent-erlang/Dockerfile | 2 +- jenkins-agents/jenkins-agent-golang/Dockerfile | 2 +- jenkins-agents/jenkins-agent-graalvm/Dockerfile | 2 +- jenkins-agents/jenkins-agent-gradle/Dockerfile | 2 +- jenkins-agents/jenkins-agent-helm/Dockerfile | 2 +- jenkins-agents/jenkins-agent-hugo/Dockerfile | 2 +- jenkins-agents/jenkins-agent-image-mgmt/Dockerfile | 4 ++-- jenkins-agents/jenkins-agent-mongodb/Dockerfile | 2 +- jenkins-agents/jenkins-agent-mvn/Dockerfile | 2 +- jenkins-agents/jenkins-agent-npm/Dockerfile | 2 +- jenkins-agents/jenkins-agent-python/Dockerfile | 2 +- jenkins-agents/jenkins-agent-ruby/Dockerfile | 2 +- jenkins-agents/jenkins-agent-rust/Dockerfile | 2 +- jenkins-agents/jenkins-agent-zap/Dockerfile | 2 +- tool-box/Dockerfile | 2 +- utilities/ubi8-asciidoctor/Dockerfile | 2 +- utilities/ubi8-bats/Dockerfile | 2 +- utilities/ubi8-git/Dockerfile | 2 +- utilities/ubi8-google-api-python-client/Dockerfile | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build-s2i-python-kopf/Dockerfile b/build-s2i-python-kopf/Dockerfile index 1fdfed39d..5d34c6081 100644 --- a/build-s2i-python-kopf/Dockerfile +++ b/build-s2i-python-kopf/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:latest@sha256:286b53c35373ee34679e3c7d68a357785a509e14b18ea20d6ad3426af639c239 +FROM registry.access.redhat.com/ubi9/python-311:latest MAINTAINER Johnathan Kupferer diff --git a/build-s2i-python-kopf/examples/kopf-simple/Dockerfile b/build-s2i-python-kopf/examples/kopf-simple/Dockerfile index 8a34b74be..5bf4c3ac5 100644 --- a/build-s2i-python-kopf/examples/kopf-simple/Dockerfile +++ b/build-s2i-python-kopf/examples/kopf-simple/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/redhat-cop/python-kopf-s2i:latest@sha256:3ddb8e091ecece956a84d532f291d4a2748d959c6eb7d6e73531d632b59579d8 +FROM quay.io/redhat-cop/python-kopf-s2i:latest USER root diff --git a/build-s2i-python-kopf/examples/openshift-template-deployer/Dockerfile b/build-s2i-python-kopf/examples/openshift-template-deployer/Dockerfile index 8a34b74be..5bf4c3ac5 100644 --- a/build-s2i-python-kopf/examples/openshift-template-deployer/Dockerfile +++ b/build-s2i-python-kopf/examples/openshift-template-deployer/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/redhat-cop/python-kopf-s2i:latest@sha256:3ddb8e091ecece956a84d532f291d4a2748d959c6eb7d6e73531d632b59579d8 +FROM quay.io/redhat-cop/python-kopf-s2i:latest USER root diff --git a/jenkins-agents/jenkins-agent-ansible/Dockerfile b/jenkins-agents/jenkins-agent-ansible/Dockerfile index a81e87bac..673ac0f0f 100644 --- a/jenkins-agents/jenkins-agent-ansible/Dockerfile +++ b/jenkins-agents/jenkins-agent-ansible/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG ANSIBLE_VERSION=2.9.13 LABEL \ diff --git a/jenkins-agents/jenkins-agent-arachni/Dockerfile b/jenkins-agents/jenkins-agent-arachni/Dockerfile index fdfaa7cf5..9abcbe4af 100644 --- a/jenkins-agents/jenkins-agent-arachni/Dockerfile +++ b/jenkins-agents/jenkins-agent-arachni/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG VERSION=1.5.1 ARG WEB_VERSION=0.5.12 diff --git a/jenkins-agents/jenkins-agent-argocd/Dockerfile b/jenkins-agents/jenkins-agent-argocd/Dockerfile index b1e7c4436..add648538 100644 --- a/jenkins-agents/jenkins-agent-argocd/Dockerfile +++ b/jenkins-agents/jenkins-agent-argocd/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ENV ARGOCD_VERSION=2.2.3 \ YQ_VERSION=v4.16.2 diff --git a/jenkins-agents/jenkins-agent-conftest/Dockerfile b/jenkins-agents/jenkins-agent-conftest/Dockerfile index 39b7a4174..03fbd2dee 100644 --- a/jenkins-agents/jenkins-agent-conftest/Dockerfile +++ b/jenkins-agents/jenkins-agent-conftest/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/redhat-cop/jenkins-agent-python:v1.0@sha256:6db6f00490699c05fe7412fad2c1d9f85dd30323f620eab2fc2af6ec0ff60d93 +FROM quay.io/redhat-cop/jenkins-agent-python:v1.0 # ^ needed to install the python yq library 🐍 ARG BATS_VERSION=1.2.0 diff --git a/jenkins-agents/jenkins-agent-cosign/Dockerfile b/jenkins-agents/jenkins-agent-cosign/Dockerfile index 40789a2fb..9f4975214 100644 --- a/jenkins-agents/jenkins-agent-cosign/Dockerfile +++ b/jenkins-agents/jenkins-agent-cosign/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 USER root diff --git a/jenkins-agents/jenkins-agent-erlang/Dockerfile b/jenkins-agents/jenkins-agent-erlang/Dockerfile index 925d9915c..431e66029 100644 --- a/jenkins-agents/jenkins-agent-erlang/Dockerfile +++ b/jenkins-agents/jenkins-agent-erlang/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG ERLANG_VERSION=22.1.4 ARG REBAR3_VERSION=3.12.0 diff --git a/jenkins-agents/jenkins-agent-golang/Dockerfile b/jenkins-agents/jenkins-agent-golang/Dockerfile index 37c30a763..e4491ab8c 100644 --- a/jenkins-agents/jenkins-agent-golang/Dockerfile +++ b/jenkins-agents/jenkins-agent-golang/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG GO_VERSION=1.15.6 ARG SONAR_SCANNER_VERSION=4.5.0.2216 diff --git a/jenkins-agents/jenkins-agent-graalvm/Dockerfile b/jenkins-agents/jenkins-agent-graalvm/Dockerfile index 73503173c..c09809aff 100644 --- a/jenkins-agents/jenkins-agent-graalvm/Dockerfile +++ b/jenkins-agents/jenkins-agent-graalvm/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-maven:4.9@sha256:22e16191c77481a4f6f06ed7c2b33cead0c2631de5daa65cb1a6c174f41b7334 +FROM quay.io/openshift/origin-jenkins-agent-maven:4.9 ARG GRAAL_VERSION=20.3.3.0-Final ENV GRAALVM_HOME=/opt/mandrelJDK ENV GRAAL_CE_URL=https://github.com/graalvm/mandrel/releases/download/mandrel-${GRAAL_VERSION}/mandrel-java11-linux-amd64-${GRAAL_VERSION}.tar.gz diff --git a/jenkins-agents/jenkins-agent-gradle/Dockerfile b/jenkins-agents/jenkins-agent-gradle/Dockerfile index ab1a0fc9e..28b83e2cc 100644 --- a/jenkins-agents/jenkins-agent-gradle/Dockerfile +++ b/jenkins-agents/jenkins-agent-gradle/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ENV GRADLE_VERSION=6.3 ENV GRADLE_USER_HOME=/home/jenkins/.gradle diff --git a/jenkins-agents/jenkins-agent-helm/Dockerfile b/jenkins-agents/jenkins-agent-helm/Dockerfile index 84a5ed703..2ccbdc365 100644 --- a/jenkins-agents/jenkins-agent-helm/Dockerfile +++ b/jenkins-agents/jenkins-agent-helm/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG VERSION=3.5.2 ARG YQ_VERSION=v4.5.1 diff --git a/jenkins-agents/jenkins-agent-hugo/Dockerfile b/jenkins-agents/jenkins-agent-hugo/Dockerfile index bff11869e..e3db0024c 100644 --- a/jenkins-agents/jenkins-agent-hugo/Dockerfile +++ b/jenkins-agents/jenkins-agent-hugo/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ENV HUGO_VERSION=0.83.1 diff --git a/jenkins-agents/jenkins-agent-image-mgmt/Dockerfile b/jenkins-agents/jenkins-agent-image-mgmt/Dockerfile index cb9b87b90..d099725ed 100644 --- a/jenkins-agents/jenkins-agent-image-mgmt/Dockerfile +++ b/jenkins-agents/jenkins-agent-image-mgmt/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/go-toolset:latest@sha256:c78305ff7360bdacdd790225ca10478e08dd6fcbc037bcd176acdf4a552995da as builder +FROM registry.access.redhat.com/ubi8/go-toolset:latest as builder ARG SKOPEO_VERSION=1.5.2 @@ -9,7 +9,7 @@ RUN curl -L https://github.com/containers/skopeo/archive/v${SKOPEO_VERSION}.tar. cd /tmp/skopeo && \ make BUILDTAGS=containers_image_openpgp DISABLE_DOCS=1 CGO_ENABLED=0 GO_DYN_FLAGS= -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG OC_VERSION=4.9 diff --git a/jenkins-agents/jenkins-agent-mongodb/Dockerfile b/jenkins-agents/jenkins-agent-mongodb/Dockerfile index a6efbc14f..67960a95a 100644 --- a/jenkins-agents/jenkins-agent-mongodb/Dockerfile +++ b/jenkins-agents/jenkins-agent-mongodb/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 USER root diff --git a/jenkins-agents/jenkins-agent-mvn/Dockerfile b/jenkins-agents/jenkins-agent-mvn/Dockerfile index c84f50e32..42a523b47 100644 --- a/jenkins-agents/jenkins-agent-mvn/Dockerfile +++ b/jenkins-agents/jenkins-agent-mvn/Dockerfile @@ -1,2 +1,2 @@ -FROM quay.io/openshift/origin-jenkins-agent-maven:4.9@sha256:22e16191c77481a4f6f06ed7c2b33cead0c2631de5daa65cb1a6c174f41b7334 +FROM quay.io/openshift/origin-jenkins-agent-maven:4.9 ADD settings.xml $HOME/.m2/settings.xml diff --git a/jenkins-agents/jenkins-agent-npm/Dockerfile b/jenkins-agents/jenkins-agent-npm/Dockerfile index 1aa9c1a7b..cafc3e3f7 100644 --- a/jenkins-agents/jenkins-agent-npm/Dockerfile +++ b/jenkins-agents/jenkins-agent-npm/Dockerfile @@ -1,5 +1,5 @@ #invoke npm in jenkinsfile: sh "scl enable rh-nodejs6 'npm run build'" -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG JQ_VERSION=1.6 ARG OC_VERSION=4.8 diff --git a/jenkins-agents/jenkins-agent-python/Dockerfile b/jenkins-agents/jenkins-agent-python/Dockerfile index ff6a029c8..d416c1438 100644 --- a/jenkins-agents/jenkins-agent-python/Dockerfile +++ b/jenkins-agents/jenkins-agent-python/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 EXPOSE 8080 diff --git a/jenkins-agents/jenkins-agent-ruby/Dockerfile b/jenkins-agents/jenkins-agent-ruby/Dockerfile index ce2f13237..4901f2890 100644 --- a/jenkins-agents/jenkins-agent-ruby/Dockerfile +++ b/jenkins-agents/jenkins-agent-ruby/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 ARG RUBY_VERSION=2.7 ARG OC_VERSION=4.9 diff --git a/jenkins-agents/jenkins-agent-rust/Dockerfile b/jenkins-agents/jenkins-agent-rust/Dockerfile index 6355178e0..c30ed37cf 100644 --- a/jenkins-agents/jenkins-agent-rust/Dockerfile +++ b/jenkins-agents/jenkins-agent-rust/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-jenkins-agent-base:4.9@sha256:94025d11174dbf836427236733d1b82010a21cf83c5321ec168db761fc2c28e7 +FROM quay.io/openshift/origin-jenkins-agent-base:4.9 LABEL com.redhat.component="jenkins-agent-rust-ubi7-docker" \ name="openshift/origin-jenkins-agent-rust-ubi7" \ diff --git a/jenkins-agents/jenkins-agent-zap/Dockerfile b/jenkins-agents/jenkins-agent-zap/Dockerfile index e38c11c8b..c67ce2657 100644 --- a/jenkins-agents/jenkins-agent-zap/Dockerfile +++ b/jenkins-agents/jenkins-agent-zap/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/centos/centos:centos7@sha256:e4ca2ed0202e76be184e75fb26d14bf974193579039d5573fb2348664deef76e +FROM quay.io/centos/centos:centos7 ARG ZAPROXY_VERSION="2.9.0" ARG WEBSWING_VERSION="22.2" diff --git a/tool-box/Dockerfile b/tool-box/Dockerfile index b4aaa7fee..3bc0fb0be 100644 --- a/tool-box/Dockerfile +++ b/tool-box/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8@sha256:449da7f8f2ef6285a8445a1e31af57a97b9dae5dcf009b1629c59742c89c68c3 +FROM registry.access.redhat.com/ubi8 ENV OC_VERSION=stable-4.12 \ ROSA_VERSION=1.2.15 \ diff --git a/utilities/ubi8-asciidoctor/Dockerfile b/utilities/ubi8-asciidoctor/Dockerfile index ff562b9bd..7d3fc595b 100644 --- a/utilities/ubi8-asciidoctor/Dockerfile +++ b/utilities/ubi8-asciidoctor/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8:latest@sha256:449da7f8f2ef6285a8445a1e31af57a97b9dae5dcf009b1629c59742c89c68c3 +FROM registry.access.redhat.com/ubi8:latest LABEL MAINTAINERS="Red Hat Services" diff --git a/utilities/ubi8-bats/Dockerfile b/utilities/ubi8-bats/Dockerfile index c5cd7af2b..0fc081855 100644 --- a/utilities/ubi8-bats/Dockerfile +++ b/utilities/ubi8-bats/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:87bcbfedfd70e67aab3875fff103bade460aeff510033ebb36b7efa009ab6639 +FROM registry.access.redhat.com/ubi8/ubi-minimal LABEL io.k8s.description="OCP Bats" LABEL io.k8s.display-name="OCP Bats" diff --git a/utilities/ubi8-git/Dockerfile b/utilities/ubi8-git/Dockerfile index 570ad87c9..cbd912ba5 100644 --- a/utilities/ubi8-git/Dockerfile +++ b/utilities/ubi8-git/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8@sha256:449da7f8f2ef6285a8445a1e31af57a97b9dae5dcf009b1629c59742c89c68c3 +FROM registry.access.redhat.com/ubi8 LABEL maintainer="Red Hat Services" diff --git a/utilities/ubi8-google-api-python-client/Dockerfile b/utilities/ubi8-google-api-python-client/Dockerfile index 4b24fac76..7323b98ec 100644 --- a/utilities/ubi8-google-api-python-client/Dockerfile +++ b/utilities/ubi8-google-api-python-client/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8@sha256:449da7f8f2ef6285a8445a1e31af57a97b9dae5dcf009b1629c59742c89c68c3 +FROM registry.access.redhat.com/ubi8 LABEL maintainer="Red Hat Services"