From 21eb12e50a8c268a61e850a7b7e8bc42e384ada8 Mon Sep 17 00:00:00 2001 From: Pierre Prinetti Date: Mon, 21 Dec 2020 14:01:15 +0100 Subject: [PATCH] Bump base images to ocp v4.8 and Go to v1.15 --- Dockerfile | 4 ++-- Dockerfile.rhel | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3fca6f2e0e..4a2665fec9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 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/openshift/origin-v4.0:base +FROM registry.svc.ci.openshift.org/openshift/origin-v4.8:base COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager / diff --git a/Dockerfile.rhel b/Dockerfile.rhel index da31947327..8e0b3b98e4 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.7 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 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.7:base +FROM registry.svc.ci.openshift.org/ocp/4.8:base RUN INSTALL_PKGS=" \ openssh \ " && \