Skip to content

Commit

Permalink
Merge pull request #421 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.10-ose-aws-machine-controllers

Updating ose-aws-machine-controllers images to be consistent with ART
  • Loading branch information
openshift-merge-robot authored Sep 7, 2021
2 parents f5013d0 + cb6835e commit a815e7e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws
COPY . .
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own
RUN unset VERSION \
&& GOPROXY=off NO_DOCKER=1 make build

FROM registry.ci.openshift.org/ocp/4.9:base
FROM registry.ci.openshift.org/ocp/4.10:base
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-aws/bin/machine-controller-manager /
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-aws/bin/termination-handler /

0 comments on commit a815e7e

Please sign in to comment.