Skip to content

Commit

Permalink
Merge pull request #6 from openshift-bot/updating-dockerfile.openshif…
Browse files Browse the repository at this point in the history
…t-baseimages-to-mach-ocp-build-data-config

Bug 1872080: Updating Dockerfile.openshift baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 25, 2020
2 parents e2a7c4b + 5eb663f commit 4f2bac9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This dockerfile is used for building for OpenShift
FROM openshift/origin-release:rhel-8-golang-1.12 as rhel8
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 as rhel8
ADD . /usr/src/route-override
WORKDIR /usr/src/route-override
ENV CGO_ENABLED=0
Expand All @@ -8,15 +8,15 @@ ENV VERSION=rhel8 COMMIT=unset
RUN ./build_linux.sh
WORKDIR /

FROM openshift/origin-release:rhel-7-golang-1.12 as rhel7
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-openshift-4.6 as rhel7
ADD . /usr/src/route-override
WORKDIR /usr/src/route-override
ENV CGO_ENABLED=0
ENV GO111MODULE=off
RUN ./build_linux.sh
WORKDIR /

FROM openshift/origin-base
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6
COPY --from=rhel7 /usr/src/route-override/bin/route-override /usr/src/route-override/rhel7/bin/route-override
COPY --from=rhel8 /usr/src/route-override/bin/route-override /usr/src/route-override/bin/route-override
COPY --from=rhel8 /usr/src/route-override/bin/route-override /usr/src/route-override/rhel8/bin/route-override
Expand Down

0 comments on commit 4f2bac9

Please sign in to comment.