Skip to content

Commit

Permalink
Merge pull request openshift#1497 from vrutkovs/upi-multistage-cli
Browse files Browse the repository at this point in the history
Dockerfile.upi.ci: declari cli image as input image
  • Loading branch information
openshift-merge-robot authored Mar 29, 2019
2 parents 4354ddf + d8522e9 commit 58a2767
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions images/installer/Dockerfile.upi.ci
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ WORKDIR /go/src/github.com/openshift/installer
COPY . .
RUN hack/build.sh

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:cli as cli

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
COPY --from=registry.svc.ci.openshift.org/openshift/origin-v4.0:cli /usr/bin/oc /bin/oc
COPY --from=cli /usr/bin/oc /bin/oc
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi

Expand All @@ -32,4 +34,3 @@ USER 1000:1000
ENV PATH /bin
ENV HOME /output
WORKDIR /output

0 comments on commit 58a2767

Please sign in to comment.