From 3e2b950ad0603a14bd0f75434a1d158be1a475e5 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 27 May 2024 17:04:30 +0000 Subject: [PATCH] Updating openshift-enterprise-builder-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/54398c23417ea7da99175bcbf7f81bbe2371c451/images/openshift-enterprise-builder.yml --- .ci-operator.yaml | 2 +- Dockerfile.rhel8 | 4 ++-- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a83f0f8430..1e59c02c25 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.21-openshift-4.16 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/Dockerfile.rhel8 b/Dockerfile.rhel8 index 418281190e..e631ac6c44 100644 --- a/Dockerfile.rhel8 +++ b/Dockerfile.rhel8 @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder WORKDIR /go/src/github.com/openshift/builder COPY . . RUN hack/build.sh -FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.16 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.17 RUN INSTALL_PKGS=" \ bind-utils bsdtar findutils fuse-overlayfs git git-lfs hostname lsof \ netavark procps-ng runc socat tar tree util-linux wget which \ diff --git a/go.mod b/go.mod index f0080bd0a3..97b02573e5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/builder -go 1.21 +go 1.22 require ( github.com/MakeNowJust/heredoc v1.0.0