2
2
# the installer layered on top of the cluster-native Linux installer image.
3
3
4
4
# We copy from the -artifacts images because they are statically linked
5
- FROM registry.ci.openshift.org/ocp/4.19 :installer-kube-apiserver-artifacts AS kas-artifacts
6
- FROM registry.ci.openshift.org/ocp/4.19 :installer-etcd-artifacts AS etcd-artifacts
5
+ FROM registry.ci.openshift.org/ocp/4.20 :installer-kube-apiserver-artifacts AS kas-artifacts
6
+ FROM registry.ci.openshift.org/ocp/4.20 :installer-etcd-artifacts AS etcd-artifacts
7
7
8
8
# FIPS support is offered via the baremetal-installer image
9
9
10
- FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23 -openshift-4.19 AS macbuilder
10
+ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24 -openshift-4.20 AS macbuilder
11
11
ENV GO_COMPLIANCE_EXCLUDE=".*"
12
12
ARG TAGS=""
13
13
WORKDIR /go/src/github.com/openshift/installer
@@ -16,7 +16,7 @@ COPY --from=kas-artifacts /usr/share/openshift/darwin/amd64 cluster-api/bin/darw
16
16
COPY --from=etcd-artifacts /usr/share/openshift/darwin/amd64 cluster-api/bin/darwin_amd64
17
17
RUN GOOS=darwin GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
18
18
19
- FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23 -openshift-4.19 AS macarmbuilder
19
+ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24 -openshift-4.20 AS macarmbuilder
20
20
ENV GO_COMPLIANCE_EXCLUDE=".*"
21
21
ARG TAGS=""
22
22
WORKDIR /go/src/github.com/openshift/installer
@@ -25,7 +25,7 @@ COPY --from=kas-artifacts /usr/share/openshift/darwin/arm64 cluster-api/bin/darw
25
25
COPY --from=etcd-artifacts /usr/share/openshift/darwin/arm64 cluster-api/bin/darwin_arm64
26
26
RUN GOOS=darwin GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
27
27
28
- FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23 -openshift-4.19 AS linuxbuilder
28
+ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24 -openshift-4.20 AS linuxbuilder
29
29
ENV GO_COMPLIANCE_EXCLUDE=".*"
30
30
ARG TAGS=""
31
31
WORKDIR /go/src/github.com/openshift/installer
@@ -34,7 +34,7 @@ COPY --from=kas-artifacts /usr/share/openshift/linux/amd64 cluster-api/bin/linux
34
34
COPY --from=etcd-artifacts /usr/share/openshift/linux/amd64 cluster-api/bin/linux_amd64
35
35
RUN GOOS=linux GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
36
36
37
- FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23 -openshift-4.19 AS linuxarmbuilder
37
+ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24 -openshift-4.20 AS linuxarmbuilder
38
38
ENV GO_COMPLIANCE_EXCLUDE=".*"
39
39
ARG TAGS=""
40
40
ARG SKIP_ENVTEST="y"
@@ -44,14 +44,14 @@ COPY --from=kas-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux
44
44
COPY --from=etcd-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux_arm64
45
45
RUN GOOS=linux GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
46
46
47
- FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23 -openshift-4.19 AS builder
47
+ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24 -openshift-4.20 AS builder
48
48
ENV GO_COMPLIANCE_EXCLUDE=".*"
49
49
ARG TAGS=""
50
50
WORKDIR /go/src/github.com/openshift/installer
51
51
COPY . .
52
52
RUN go run -mod=vendor hack/build-coreos-manifest.go
53
53
54
- FROM registry.ci.openshift.org/ocp/4.19 :base-rhel9
54
+ FROM registry.ci.openshift.org/ocp/4.20 :base-rhel9
55
55
COPY --from=macbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install
56
56
COPY --from=macarmbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac_arm64/openshift-install
57
57
COPY --from=linuxbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/linux_amd64/openshift-install
0 commit comments