File tree Expand file tree Collapse file tree 4 files changed +12
-7
lines changed Expand file tree Collapse file tree 4 files changed +12
-7
lines changed Original file line number Diff line number Diff line change 1
1
build_root_image :
2
2
name : release
3
3
namespace : openshift
4
- tag : rhel-9-release-golang-1.21 -openshift-4.16
4
+ tag : rhel-9-release-golang-1.22 -openshift-4.17
Original file line number Diff line number Diff line change 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
2
2
ENV GOPATH /go
3
3
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
4
4
WORKDIR /src
5
5
COPY . .
6
+ # Install golang 1.22.2
7
+ RUN go install 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
6
11
RUN make build/registry cross
7
12
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
9
14
ENV GOPATH /go
10
15
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
11
16
WORKDIR /src
Original file line number Diff line number Diff line change 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
2
2
3
3
ENV GO111MODULE auto
4
4
ENV GOPATH /go
@@ -18,7 +18,7 @@ RUN mkdir -p .git/objects
18
18
COPY . .
19
19
RUN make build/olm bin/cpb
20
20
21
- FROM registry.ci.openshift.org/ocp/4.16 :base-rhel9
21
+ FROM registry.ci.openshift.org/ocp/4.17 :base-rhel9
22
22
23
23
ADD manifests/ /manifests
24
24
LABEL io.openshift.release.operator=true
Original file line number Diff line number Diff line change 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
2
2
3
3
ENV GOPATH /go
4
4
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
@@ -11,7 +11,7 @@ RUN make build/registry cross
11
11
# copy and build vendored grpc_health_probe
12
12
RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/...
13
13
14
- FROM registry.ci.openshift.org/ocp/4.16 :base-rhel9
14
+ FROM registry.ci.openshift.org/ocp/4.17 :base-rhel9
15
15
16
16
COPY --from=builder /src/bin/* /bin/registry/
17
17
COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe
You can’t perform that action at this time.
0 commit comments