Skip to content

Commit 707dd38

Browse files
Merge pull request #16 from openshift-bot/art-consistency-openshift-4.9-ose-multus-route-override-cni
Updating ose-multus-route-override-cni images to be consistent with ART
2 parents 5ee9057 + ce8e5aa commit 707dd38

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Dockerfile.openshift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This dockerfile is used for building for OpenShift
2-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS rhel8
2+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS rhel8
33
ADD . /usr/src/route-override
44
WORKDIR /usr/src/route-override
55
ENV CGO_ENABLED=0
@@ -8,15 +8,15 @@ ENV VERSION=rhel8 COMMIT=unset
88
RUN ./build_linux.sh
99
WORKDIR /
1010

11-
FROM registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.15-openshift-4.7 AS rhel7
11+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS rhel7
1212
ADD . /usr/src/route-override
1313
WORKDIR /usr/src/route-override
1414
ENV CGO_ENABLED=0
1515
ENV GO111MODULE=off
1616
RUN ./build_linux.sh
1717
WORKDIR /
1818

19-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.7
19+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.9
2020
COPY --from=rhel7 /usr/src/route-override/bin/route-override /usr/src/route-override/rhel7/bin/route-override
2121
COPY --from=rhel8 /usr/src/route-override/bin/route-override /usr/src/route-override/bin/route-override
2222
COPY --from=rhel8 /usr/src/route-override/bin/route-override /usr/src/route-override/rhel8/bin/route-override

0 commit comments

Comments
 (0)