Skip to content

Commit

Permalink
Merge pull request #143 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 26, 2020
2 parents d966506 + f7230e7 commit fe4f765
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,9 +1,9 @@
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/local-storage-operator
COPY . .
RUN make build-operator

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/openshift/local-storage-operator/_output/bin/local-storage-operator /usr/bin/
COPY manifests /manifests
ENTRYPOINT ["/usr/bin/local-storage-operator"]
Expand Down

0 comments on commit fe4f765

Please sign in to comment.