diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e307e5af6..284a91009 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.24-openshift-4.21 + tag: rhel-9-release-golang-1.24-openshift-4.22 diff --git a/openshift/operator-controller.Dockerfile b/openshift/operator-controller.Dockerfile index 9b47776e7..350dd545c 100644 --- a/openshift/operator-controller.Dockerfile +++ b/openshift/operator-controller.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder ARG SOURCE_GIT_COMMIT ENV GIT_COMMIT=${SOURCE_GIT_COMMIT} @@ -14,7 +14,7 @@ RUN make -f openshift/Makefile go-build-local && \ cp ./bin/olmv1-tests-ext /tmp/build/olmv1-tests-ext && \ gzip -f /tmp/build/olmv1-tests-ext -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 USER 1001 COPY --from=builder /build/bin/operator-controller /operator-controller COPY --from=builder /tmp/build/olmv1-tests-ext.gz /usr/bin/olmv1-tests-ext.gz