From 55fb40b437465d72ceb6d82556f5acf68339928f Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 5 Sep 2024 16:13:51 +0000 Subject: [PATCH] Updating ose-haproxy-router-base-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-haproxy-router-base.yml --- .ci-operator.yaml | 2 +- images/router/base/Dockerfile.ocp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 1e59c02c2..64887a08b 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.22-openshift-4.17 + tag: rhel-9-release-golang-1.22-openshift-4.18 diff --git a/images/router/base/Dockerfile.ocp b/images/router/base/Dockerfile.ocp index ad9bf60d2..03a56438f 100644 --- a/images/router/base/Dockerfile.ocp +++ b/images/router/base/Dockerfile.ocp @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder WORKDIR /go/src/github.com/openshift/router COPY . . RUN make -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 COPY --from=builder /go/src/github.com/openshift/router/openshift-router /usr/bin/ LABEL io.k8s.display-name="OpenShift Router" \ io.k8s.description="This is the base image from which all template based routers inherit." \