Skip to content

Commit

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

Bug 1872080: Updating Dockerfile.rhel7 baseimages to match ocp-build-data config
  • Loading branch information
openshift-merge-robot committed Aug 26, 2020
2 parents bcf385b + a4044f4 commit 00aa243
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
@@ -1,11 +1,11 @@
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/cluster-version-operator
COPY . .
RUN hack/build-go.sh; \
mkdir -p /tmp/build; \
cp _output/linux/$(go env GOARCH)/cluster-version-operator /tmp/build/cluster-version-operator

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
COPY install /manifests
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/
Expand Down

0 comments on commit 00aa243

Please sign in to comment.