Skip to content

Commit

Permalink
Merge pull request #330 from jupierce/art-consistency-openshift-4.7-o…
Browse files Browse the repository at this point in the history
…se-cluster-samples-operator

Updating ose-cluster-samples-operator builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Oct 7, 2020
2 parents a543ba6 + e091970 commit 1056e52
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
WORKDIR /go/src/github.com/openshift/cluster-samples-operator
COPY . .
RUN make build

FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift
COPY --from=builder /go/src/github.com/openshift/cluster-samples-operator/cluster-samples-operator /usr/bin/
RUN ln -f /usr/bin/cluster-samples-operator /usr/bin/cluster-samples-operator-watch
COPY manifests/image-references manifests/0* /manifests/
Expand Down

0 comments on commit 1056e52

Please sign in to comment.