From 424d14ae95959353ffabfd36307560ab2abcddd8 Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Mon, 28 Oct 2019 15:04:11 +0100 Subject: [PATCH] Bump golang from 1.10 to 1.12 Minimal golang version for k8s 1.16 is 1.12 so we have to upgrade our images. --- Dockerfile | 2 +- Dockerfile.rhel7 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5a0458186..ab1f25103a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack COPY . . diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index 361bfc85f9..156ab1f92f 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack COPY . .