Skip to content

Commit 71817d2

Browse files
Merge pull request #906 from openshift-bot/art-consistency-openshift-4.17-openshift-enterprise-console-operator
OCPBUGS-34364: Updating openshift-enterprise-console-operator-container image to be consistent with ART for 4.17
2 parents 7e52f16 + 6a3d1cb commit 71817d2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
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.21-openshift-4.16
4+
tag: rhel-9-release-golang-1.22-openshift-4.17

Dockerfile.rhel7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
22
ARG TAGS=ocp
33
WORKDIR /go/src/github.com/openshift/console-operator
44
COPY . .
55
ENV GO_PACKAGE github.com/openshift/console-operator
66
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="${TAGS}" -o console ./cmd/console
77

8-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
99
RUN useradd console-operator
1010
USER console-operator
1111
COPY --from=builder /go/src/github.com/openshift/console-operator/console /usr/bin/console

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/console-operator
22

3-
go 1.21
3+
go 1.22
44

55
toolchain go1.22.1
66

0 commit comments

Comments
 (0)