From 88d2c2ad56f7aa351584e5cbc0391f79c3205edc Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Thu, 17 Sep 2020 11:16:44 +0300 Subject: [PATCH] Bug 1878163: Updating Dockerfile.rhel baseimages to mach ocp-build-data config Upgrade to golang 1.15 --- Dockerfile.ci | 2 +- Dockerfile.ocp | 2 +- build/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 547938b4b3..3592de152d 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,5 +1,5 @@ # Step one: build compliance-operator -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/compliance-operator diff --git a/Dockerfile.ocp b/Dockerfile.ocp index 0c90cc3e32..b7db2ff298 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,5 +1,5 @@ # Step one: build compliance-operator -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/compliance-operator diff --git a/build/Dockerfile b/build/Dockerfile index baefe2861f..eb8699b4ff 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,5 @@ # Step one: build compliance-operator -FROM golang:1.14 AS builder +FROM golang:1.15 AS builder WORKDIR /go/src/github.com/openshift/compliance-operator