Skip to content

Commit 3162eb7

Browse files
Merge pull request openshift#383 from openshift-bot/art-consistency-openshift-4.20-prom-label-proxy
OCPBUGS-57850: Updating prom-label-proxy-container image to be consistent with ART for 4.20
2 parents f5ee40f + b1a463e commit 3162eb7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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.23-openshift-4.19
4+
tag: rhel-9-release-golang-1.24-openshift-4.20

Dockerfile.ocp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# FROM directives are overriden by CI system (both Prow CI and OSBS)
2-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
2+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
33

44
WORKDIR /go/src/github.com/openshift/prom-label-proxy
55
COPY . .
66
RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make build
77

8-
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
99
COPY --from=builder /go/src/github.com/openshift/prom-label-proxy/prom-label-proxy /usr/bin/prom-label-proxy
1010

1111
LABEL io.k8s.display-name="" \

0 commit comments

Comments
 (0)