Skip to content

Commit

Permalink
Merge pull request #4085 from openshift-bot/updating-images/installer…
Browse files Browse the repository at this point in the history
…-artifacts/dockerfile.rhel-baseimages-to-mach-ocp-build-data-config

Bug 1872080: Updating images/installer-artifacts/Dockerfile.rhel baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot committed Sep 3, 2020
2 parents 626fccd + 79a30c0 commit 7a90251
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions images/installer-artifacts/Dockerfile.rhel
@@ -1,11 +1,11 @@
# This Dockerfile builds an image containing the Mac version of the installer layered
# on top of the Linux installer image.

FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/github.com/openshift/installer
COPY . .
RUN go generate ./data && \
SKIP_GENERATION=y GOOS=darwin GOARCH=amd64 hack/build.sh

FROM registry.svc.ci.openshift.org/ocp/4.1:installer
FROM registry.svc.ci.openshift.org/ocp/4.6:installer
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install

0 comments on commit 7a90251

Please sign in to comment.