From 67740f45df3ec29688292cc29e7c16d5918b47ef Mon Sep 17 00:00:00 2001 From: Michael McCune Date: Wed, 2 Sep 2020 16:15:19 -0400 Subject: [PATCH] remove Dockerfile.rhel7 This change removes the now deprecated Dockerfile.rhel7 in favor of the new Dockerfile.rhel file. --- Dockerfile.rhel7 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Dockerfile.rhel7 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 deleted file mode 100644 index 0ffc62b953..0000000000 --- a/Dockerfile.rhel7 +++ /dev/null @@ -1,10 +0,0 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 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.svc.ci.openshift.org/ocp/4.0: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 /