Skip to content

Commit

Permalink
Merge pull request #858 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.9-ose-cli-artifacts-alt

Updating ose-cli-artifacts-alt images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jun 22, 2021
2 parents dd05562 + 907feb4 commit e0a5679
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions images/cli-artifacts/Dockerfile.rhel
@@ -1,11 +1,11 @@
# This Dockerfile builds an image containing the Mac and Windows version of oc
# layered on top of the Linux cli image.
FROM registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.16-openshift-4.8 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.16-openshift-4.9 AS builder
WORKDIR /go/src/github.com/openshift/oc
COPY . .
RUN make cross-build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.8:cli
FROM registry.ci.openshift.org/ocp/4.9:cli
COPY --from=builder /go/src/github.com/openshift/oc/_output/bin/darwin_amd64/oc /usr/share/openshift/mac/oc
COPY --from=builder /go/src/github.com/openshift/oc/_output/bin/windows_amd64/oc.exe /usr/share/openshift/windows/oc.exe
COPY --from=builder /go/src/github.com/openshift/oc/_output/bin/linux_amd64/oc /usr/share/openshift/linux_amd64/oc
Expand Down

0 comments on commit e0a5679

Please sign in to comment.