Skip to content

Commit f2e5d60

Browse files
Merge pull request openshift#467 from kunalmemane/art-consistency-ocp-4.19-builder
OCPBUGS-45492: Updating openshift-enterprise-builder-container image to be consistent with ART for 4.19
2 parents 3ea943b + fac3c8c commit f2e5d60

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.22-openshift-4.18
4+
tag: rhel-9-release-golang-1.23-openshift-4.19

Containerfile.ocp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/github.com/openshift/builder
33
COPY . .
44
RUN hack/build.sh
55

6-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.18
6+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
77
RUN INSTALL_PKGS=" \
88
bind-utils bsdtar findutils fuse-overlayfs git git-lfs hostname lsof \
99
netavark procps-ng runc socat tar util-linux wget which \

Dockerfile.rhel8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/github.com/openshift/builder
33
COPY . .
44
RUN hack/build.sh
55

6-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-4.18
6+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
77
RUN INSTALL_PKGS=" \
88
bind-utils bsdtar findutils fuse-overlayfs git git-lfs hostname lsof \
99
netavark procps-ng runc socat tar util-linux wget which \

id_rsa_prabhakars_vm.pub

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)