From 7676b98c2479b4c0ca90526cc557a23e0e25c3a8 Mon Sep 17 00:00:00 2001 From: Evgeny Slutsky Date: Tue, 2 Apr 2024 11:40:40 +0300 Subject: [PATCH] USHIFT-2810: update multiplatform builder image Signed-off-by: Evgeny Slutsky --- Makefile | 2 +- packaging/images/Containerfile.rpm-builder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dac1d59d15..4cab31c68a 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ GO_TEST_PACKAGES=./cmd/... ./pkg/... export CGO_ENABLED ?= 1 # Specify OCP build tools image tag when building rpm with podman -RPM_BUILDER_IMAGE_TAG := rhel-9-golang-latest-openshift-4.15 +RPM_BUILDER_IMAGE_TAG := rhel-9-golang-1.20-builder-multi-openshift-4.16 all: generate-config microshift etcd diff --git a/packaging/images/Containerfile.rpm-builder b/packaging/images/Containerfile.rpm-builder index f47cc46ce3..a92400a979 100644 --- a/packaging/images/Containerfile.rpm-builder +++ b/packaging/images/Containerfile.rpm-builder @@ -1,5 +1,5 @@ ARG TAG -FROM registry.ci.openshift.org/ocp-multi/builder:$TAG +FROM registry.ci.openshift.org/ocp/builder:$TAG RUN rm -rfv /etc/yum.repos.d/ci-rpm-mirrors.repo /etc/yum.repos.d/localdev* && \ dnf install \