Merge pull request #623 from openshift-bot/art-consistency-openshift-…

…4.18-ose-haproxy-router-base OCPBUGS-41237: Updating ose-haproxy-router-base-container image to be consistent with ART for 4.18
openshift · Sep 10, 2024 · 72114ea · 72114ea
2 parents 47b8420 + 55fb40b
commit 72114ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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." \