From 892c2ea7b2de32b61596a70d8a132e459bd54ac9 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 1 Mar 2021 10:10:45 +0000 Subject: [PATCH] Updating ose-openstack-machine-controllers builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/c20166dc896f07571d3f3a1f7a3dcded3e575440/images/ose-openstack-machine-controllers.yml --- Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 2094c87d58..0503d338b0 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,10 +1,10 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-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.6:base +FROM registry.ci.openshift.org/ocp/4.6:base RUN INSTALL_PKGS=" \ openssh \ " && \