From 93cbb65522c60078b8a7a17ea497c7639388be0e Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Tue, 14 Mar 2023 10:47:56 -0500 Subject: [PATCH] Use golang 1.20, RHEL 9, and OpenShift 4.14 images for CI To use golang version 1.20, we need to use a RHEL9 image with OpenShift 4.14, because that is what's available in the CI registries. --- Dockerfile.ci | 4 ++-- Dockerfile.ocp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 8dc8971fb..ff4c5cb88 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,5 +1,5 @@ # Step one: build compliance-operator -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.19-openshift-4.12 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.20-openshift-4.14 AS builder WORKDIR /go/src/github.com/openshift/compliance-operator @@ -10,7 +10,7 @@ COPY . . RUN make manager # Step two: containerize compliance-operator -FROM registry.access.redhat.com/ubi8/ubi-micro:latest +FROM registry.access.redhat.com/ubi9/ubi-micro:latest ENV OPERATOR=/usr/local/bin/compliance-operator \ USER_UID=1001 \ diff --git a/Dockerfile.ocp b/Dockerfile.ocp index 8dc8971fb..ff4c5cb88 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,5 +1,5 @@ # Step one: build compliance-operator -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.19-openshift-4.12 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.20-openshift-4.14 AS builder WORKDIR /go/src/github.com/openshift/compliance-operator @@ -10,7 +10,7 @@ COPY . . RUN make manager # Step two: containerize compliance-operator -FROM registry.access.redhat.com/ubi8/ubi-micro:latest +FROM registry.access.redhat.com/ubi9/ubi-micro:latest ENV OPERATOR=/usr/local/bin/compliance-operator \ USER_UID=1001 \