From 18c7ef8ab4124f422c3cbbe527782f1a67a45efa Mon Sep 17 00:00:00 2001 From: Vlad Bologa Date: Mon, 18 Sep 2023 13:41:08 +0200 Subject: [PATCH] Use Openshift golang-1.20 builder image --- .openshift-ci/e2e-runtime/Dockerfile | 2 +- Dockerfile | 2 +- probe/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.openshift-ci/e2e-runtime/Dockerfile b/.openshift-ci/e2e-runtime/Dockerfile index 0ed232ab65..267ea5c18f 100644 --- a/.openshift-ci/e2e-runtime/Dockerfile +++ b/.openshift-ci/e2e-runtime/Dockerfile @@ -5,7 +5,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial RUN dnf update -y --disablerepo=\* --enablerepo=baseos,appstream && dnf -y install make which git gettext jq gcc && dnf clean all && rm -rf /var/cache/dnf -COPY --from=registry.ci.openshift.org/stolostron/builder:go1.20-linux /usr/local/go /usr/local/go +COPY --from=registry.ci.openshift.org/openshift/release:golang-1.20 /usr/local/go /usr/local/go COPY --from=quay.io/openshift/origin-cli:4.13 /usr/bin/oc /usr/bin COPY --from=quay.io/operator-framework/operator-sdk:v1.25 /usr/local/bin/operator-sdk /usr/local/bin diff --git a/Dockerfile b/Dockerfile index 1e0243b3a2..3b397da0f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS build +FROM registry.ci.openshift.org/openshift/release:golang-1.20 AS build ENV GOFLAGS="-mod=mod" diff --git a/probe/Dockerfile b/probe/Dockerfile index 5029076739..f78e48be43 100644 --- a/probe/Dockerfile +++ b/probe/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS build +FROM registry.ci.openshift.org/openshift/release:golang-1.20 AS build ENV GOFLAGS="-mod=mod"