Skip to content

Commit 1a7922b

Browse files
committed
Update to go 1.24 and OCP 4.20
Update go.mod and base images in all Dockerfiles.
1 parent 9b2ae28 commit 1a7922b

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
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

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/oc
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f

images/cli-artifacts/Dockerfile.rhel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# This Dockerfile builds an image containing the Mac and Windows version of oc
22
# layered on top of the Linux cli image.
3-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19 AS builder
3+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.20 AS builder
44
WORKDIR /go/src/github.com/openshift/oc
55
COPY . .
66
RUN make cross-build --warn-undefined-variables
77

8-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder-rhel-9
8+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder-rhel-9
99
WORKDIR /go/src/github.com/openshift/oc
1010
COPY . .
1111
RUN make cross-build --warn-undefined-variables
1212

13-
FROM registry.ci.openshift.org/ocp/4.19:cli
13+
FROM registry.ci.openshift.org/ocp/4.20:cli
1414

1515
COPY --from=builder-rhel-9 /go/src/github.com/openshift/oc/_output/bin/ /usr/share/openshift/
1616

images/cli/Dockerfile.rhel

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.23-openshift-4.19 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
22
WORKDIR /go/src/github.com/openshift/oc
33
COPY . .
44
RUN make build --warn-undefined-variables
55

6-
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
6+
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
77
COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/
88
RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done
99
LABEL io.k8s.display-name="OpenShift Client" \

images/deployer/Dockerfile.rhel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/4.19:cli
1+
FROM registry.ci.openshift.org/ocp/4.20:cli
22

33
LABEL io.k8s.display-name="OpenShift Deployer" \
44
io.k8s.description="This is a component of OpenShift and executes the user deployment process to roll out new containers. It may be used as a base image for building your own custom deployer image." \

images/tools/Dockerfile

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.23-openshift-4.19 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
22
WORKDIR /go/src/github.com/openshift/oc
33
COPY . .
44
RUN make build --warn-undefined-variables
55

6-
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
6+
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
77
COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/
88
COPY --from=builder /go/src/github.com/openshift/oc/images/tools/sos.conf /etc/sos/
99
RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done

0 commit comments

Comments
 (0)