Skip to content

Commit

Permalink
Merge pull request #52 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….16-ose-multus-route-override-cni

OCPBUGS-24721: Updating ose-multus-route-override-cni-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Dec 13, 2023
2 parents f548bd4 + 1a3ace7 commit 37529c7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# This dockerfile is used for building for OpenShift
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS rhel9
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 AS rhel9
ADD . /usr/src/route-override
WORKDIR /usr/src/route-override
ENV CGO_ENABLED=0
ENV VERSION=rhel9 COMMIT=unset
RUN ./build_linux.sh
WORKDIR /

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS rhel8
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS rhel8
ADD . /usr/src/route-override
WORKDIR /usr/src/route-override
ENV CGO_ENABLED=0
Expand Down

0 comments on commit 37529c7

Please sign in to comment.