Skip to content

Commit

Permalink
Merge pull request #160 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 mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 25, 2020
2 parents 472ecfc + 9402c82 commit 88f288a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 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-autoscaler-operator
COPY . .
ENV NO_DOCKER=1
ENV BUILD_DEST=/go/bin/cluster-autoscaler-operator
RUN unset VERSION && make build

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/bin/cluster-autoscaler-operator /usr/bin/
COPY --from=builder /go/src/github.com/openshift/cluster-autoscaler-operator/install /manifests
CMD ["/usr/bin/cluster-autoscaler-operator"]
Expand Down

0 comments on commit 88f288a

Please sign in to comment.