Skip to content

Commit c3b650e

Browse files
committed
Update containers to golang-1.22 and ocp-4.17
Signed-off-by: Todd Short <[email protected]>
1 parent d3a8a3d commit c3b650e

File tree

4 files changed

+12
-7
lines changed

4 files changed

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

operator-framework-tools.Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder-rhel8
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.17 AS builder-rhel8
22
ENV GOPATH /go
33
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
44
WORKDIR /src
55
COPY . .
6+
# Install golang 1.22.2
7+
RUN go install -mod=mod golang.org/dl/go1.22.2@latest
8+
RUN go1.22.2 download
9+
RUN ln -s /go/bin/go1.22.2 /go/bin/go
10+
# Now we can make registry
611
RUN make build/registry cross
712

8-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
13+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
914
ENV GOPATH /go
1015
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
1116
WORKDIR /src

operator-lifecycle-manager.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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

33
ENV GO111MODULE auto
44
ENV GOPATH /go
@@ -18,7 +18,7 @@ RUN mkdir -p .git/objects
1818
COPY . .
1919
RUN make build/olm bin/cpb
2020

21-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
21+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
2222

2323
ADD manifests/ /manifests
2424
LABEL io.openshift.release.operator=true

operator-registry.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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

33
ENV GOPATH /go
44
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
@@ -11,7 +11,7 @@ RUN make build/registry cross
1111
# copy and build vendored grpc_health_probe
1212
RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/...
1313

14-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
14+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
1515

1616
COPY --from=builder /src/bin/* /bin/registry/
1717
COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe

0 commit comments

Comments
 (0)