Skip to content

Commit 2ea580e

Browse files
r4f4r4f4
committed
images: bump builder to golang-1.22-openshift-1.17
1 parent 93541aa commit 2ea580e

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

‎images/baremetal/Dockerfile.ci‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM registry.ci.openshift.org/ocp/4.16:etcd AS etcd
66
FROM registry.ci.openshift.org/ocp/4.16:hyperkube AS kas
77

8-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
8+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
99
ARG TAGS="baremetal fipscapable"
1010
WORKDIR /go/src/github.com/openshift/installer
1111
COPY . .

‎images/infrastructure-providers/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# FIPS support is offered via the baremetal-installer image
22

3-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS macbuilder
3+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macbuilder
44
ENV GO_COMPLIANCE_EXCLUDE=".*"
55
WORKDIR /go/src/github.com/openshift/installer
66
COPY . .
77
RUN CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 make -C terraform
88

9-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS macarmbuilder
9+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macarmbuilder
1010
ENV GO_COMPLIANCE_EXCLUDE=".*"
1111
WORKDIR /go/src/github.com/openshift/installer
1212
COPY . .
1313
RUN CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 make -C terraform
1414

15-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS linuxbuilder
15+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxbuilder
1616
ENV GO_COMPLIANCE_EXCLUDE=".*"
1717
WORKDIR /go/src/github.com/openshift/installer
1818
COPY . .
1919
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make -C terraform
2020

21-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS linuxarmbuilder
21+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxarmbuilder
2222
ENV GO_COMPLIANCE_EXCLUDE=".*"
2323
WORKDIR /go/src/github.com/openshift/installer
2424
COPY . .

‎images/installer-altinfra/Dockerfile.ci‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts
1212
FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts
1313

14-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder
14+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
1515
# FIPS support is offered via the baremetal-installer image
1616
ENV GO_COMPLIANCE_EXCLUDE=".*"
1717
ARG TAGS="altinfra"

‎images/installer-artifacts/Dockerfile.rhel‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifac
88

99
# FIPS support is offered via the baremetal-installer image
1010

11-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS macbuilder
11+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macbuilder
1212
ENV GO_COMPLIANCE_EXCLUDE=".*"
1313
ARG TAGS=""
1414
WORKDIR /go/src/github.com/openshift/installer
@@ -18,7 +18,7 @@ COPY --from=kas-artifacts /usr/share/openshift/darwin/amd64 cluster-api/bin/darw
1818
COPY --from=etcd-artifacts /usr/share/openshift/darwin/amd64 cluster-api/bin/darwin_amd64
1919
RUN GOOS=darwin GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
2020

21-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS macarmbuilder
21+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS macarmbuilder
2222
ENV GO_COMPLIANCE_EXCLUDE=".*"
2323
ARG TAGS=""
2424
WORKDIR /go/src/github.com/openshift/installer
@@ -28,7 +28,7 @@ COPY --from=kas-artifacts /usr/share/openshift/darwin/arm64 cluster-api/bin/darw
2828
COPY --from=etcd-artifacts /usr/share/openshift/darwin/arm64 cluster-api/bin/darwin_arm64
2929
RUN GOOS=darwin GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
3030

31-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS linuxbuilder
31+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxbuilder
3232
ENV GO_COMPLIANCE_EXCLUDE=".*"
3333
ARG TAGS=""
3434
WORKDIR /go/src/github.com/openshift/installer
@@ -38,7 +38,7 @@ COPY --from=kas-artifacts /usr/share/openshift/linux/amd64 cluster-api/bin/linux
3838
COPY --from=etcd-artifacts /usr/share/openshift/linux/amd64 cluster-api/bin/linux_amd64
3939
RUN GOOS=linux GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
4040

41-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS linuxarmbuilder
41+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS linuxarmbuilder
4242
ENV GO_COMPLIANCE_EXCLUDE=".*"
4343
ARG TAGS=""
4444
WORKDIR /go/src/github.com/openshift/installer
@@ -48,7 +48,7 @@ COPY --from=kas-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux
4848
COPY --from=etcd-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux_arm64
4949
RUN GOOS=linux GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
5050

51-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder
51+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
5252
ENV GO_COMPLIANCE_EXCLUDE=".*"
5353
ARG TAGS=""
5454
WORKDIR /go/src/github.com/openshift/installer

‎images/installer/Dockerfile.ci‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM registry.ci.openshift.org/ocp/4.17:installer-terraform-providers AS provide
66
FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts
77
FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts
88

9-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder
9+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
1010
# FIPS support is offered via the baremetal-installer image
1111
ENV GO_COMPLIANCE_EXCLUDE=".*"
1212
ARG TAGS=""

‎images/installer/Dockerfile.upi.ci‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# It builds an image containing binaries like jq, terraform, awscli, oc, etc. to allow bringing up UPI infrastructure.
33
# It also contains the `upi` directory that contains various terraform and cloud formation templates that are used to create infrastructure resources.
44

5-
FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
5+
FROM registry.ci.openshift.org/ocp/4.17:installer-terraform-providers as providers
66
# We copy from the -artifacts images because they are statically linked
7-
FROM registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts AS kas-artifacts
8-
FROM registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts AS etcd-artifacts
7+
FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts
8+
FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts
99

10-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
10+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
1111
# FIPS support is offered via the baremetal-installer image
1212
ENV GO_COMPLIANCE_EXCLUDE=".*"
1313
ARG TAGS=""
@@ -20,12 +20,12 @@ RUN mkdir -p cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH) && \
2020
mv cluster-api/bin/$(go env GOOS)/$(go env GOHOSTARCH)/* -t cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH)/
2121
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
2222

23-
FROM registry.ci.openshift.org/ocp/4.16:cli as cli
23+
FROM registry.ci.openshift.org/ocp/4.17:cli as cli
2424
FROM quay.io/ocp-splat/govc:v0.30.7 as govc
2525
FROM quay.io/multi-arch/yq:3.3.0 as yq3
2626
FROM quay.io/multi-arch/yq:4.30.5 as yq4
2727

28-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
28+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
2929
COPY --from=cli /usr/bin/oc /bin/oc
3030
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
3131
COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi

‎images/libvirt/Dockerfile.ci‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# oc for getting assets from an existing cluster to spin up multi-architecture compute clusters on libvirt.
44

55
# The binaries in these images are dynamically linked
6-
FROM registry.ci.openshift.org/ocp/4.16:etcd AS etcd
7-
FROM registry.ci.openshift.org/ocp/4.16:hyperkube AS kas
6+
FROM registry.ci.openshift.org/ocp/4.17:etcd AS etcd
7+
FROM registry.ci.openshift.org/ocp/4.17:hyperkube AS kas
88

9-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
9+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
1010
ARG TAGS="libvirt fipscapable"
1111
WORKDIR /go/src/github.com/openshift/installer
1212
COPY . .
@@ -16,7 +16,7 @@ RUN mkdir -p cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH) && \
1616
mv /usr/bin/etcd /usr/bin/kube-apiserver -t cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH)/
1717
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
1818

19-
FROM registry.ci.openshift.org/ocp/4.16:cli as cli
19+
FROM registry.ci.openshift.org/ocp/4.17:cli as cli
2020
FROM quay.io/multi-arch/yq:3.3.0 as yq3
2121
FROM quay.io/multi-arch/yq:4.30.5 as yq4
2222

‎images/openstack/Dockerfile.ci‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This Dockerfile is used by CI to test using OpenShift Installer against an OpenStack cloud.
22
# It builds an image containing the openshift-install command as well as the openstack cli.
3-
FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
3+
FROM registry.ci.openshift.org/ocp/4.17:installer-terraform-providers as providers
44
# We copy from the -artifacts images because they are statically linked
5-
FROM registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts AS kas-artifacts
6-
FROM registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts AS etcd-artifacts
5+
FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts
6+
FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts
77

8-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
8+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
99
# FIPS support is offered via the baremetal-installer image
1010
ENV GO_COMPLIANCE_EXCLUDE=".*"
1111
ARG TAGS=""
@@ -18,9 +18,9 @@ RUN mkdir -p cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH) && \
1818
mv cluster-api/bin/$(go env GOOS)/$(go env GOHOSTARCH)/* -t cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH)/
1919
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
2020

21-
FROM registry.ci.openshift.org/ocp/4.16:cli AS cli
21+
FROM registry.ci.openshift.org/ocp/4.17:cli AS cli
2222

23-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
23+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
2424
COPY --from=cli /usr/bin/oc /bin/oc
2525
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
2626
COPY --from=builder /go/src/github.com/openshift/installer/upi/openstack /var/lib/openshift-install/upi

0 commit comments

Comments
 (0)