From 2bba2f4c5c1ee29a37370c7eaa2bb0265eff1e84 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 18:14:31 +0000 Subject: [PATCH] Updating Dockerfile.rhel7 baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the baseimages in the Dockerfile used for promotion in order to ensure it matches the configuration in the [ocp-build-data repository][2] used for producing release artifacts. If you believe the content of this PR is incorrect, please contact the dptp team in #forum-testplatform. [1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer [2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images --- Dockerfile.rhel7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 8a4f2c740c..3fd785f7c2 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,10 +1,10 @@ -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/sigs.k8s.io/cluster-api-provider-openstack COPY . . RUN go build -o ./machine-controller-manager ./cmd/manager -FROM registry.svc.ci.openshift.org/ocp/4.0:base +FROM registry.svc.ci.openshift.org/ocp/4.6:base RUN INSTALL_PKGS=" \ openssh \ " && \