mirror of
https://github.com/openshift/installer.git
synced 2026-02-05 06:46:36 +01:00
images: bump images to go 4.20
openshift-bot created PRs to bump several images: https://github.com/openshift/installer/pull/9801 https://github.com/openshift/installer/pull/9800 https://github.com/openshift/installer/pull/9799 But those didn't get all images. Bumping the rest here.
This commit is contained in:
@@ -8,10 +8,10 @@
|
||||
# not be needed.
|
||||
|
||||
# We copy from the -artifacts images because they are statically linked
|
||||
FROM registry.ci.openshift.org/ocp/4.19:installer-kube-apiserver-artifacts AS kas-artifacts
|
||||
FROM registry.ci.openshift.org/ocp/4.19:installer-etcd-artifacts AS etcd-artifacts
|
||||
FROM registry.ci.openshift.org/ocp/4.20:installer-kube-apiserver-artifacts AS kas-artifacts
|
||||
FROM registry.ci.openshift.org/ocp/4.20:installer-etcd-artifacts AS etcd-artifacts
|
||||
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
|
||||
# FIPS support is offered via the baremetal-installer image
|
||||
ENV GO_COMPLIANCE_EXCLUDE=".*"
|
||||
ARG TAGS="altinfra"
|
||||
@@ -26,7 +26,7 @@ RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
|
||||
RUN go run -mod=vendor hack/build-coreos-manifest.go
|
||||
|
||||
|
||||
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
|
||||
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
|
||||
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
|
||||
COPY --from=builder /go/src/github.com/openshift/installer/bin/manifests/ /manifests/
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts
|
||||
FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts
|
||||
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
|
||||
# FIPS support is offered via the baremetal-installer image
|
||||
ENV GO_COMPLIANCE_EXCLUDE=".*"
|
||||
ARG TAGS=""
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
FROM registry.ci.openshift.org/ocp/4.17:etcd AS etcd
|
||||
FROM registry.ci.openshift.org/ocp/4.17:hyperkube AS kas
|
||||
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
|
||||
ARG TAGS="libvirt fipscapable"
|
||||
ARG SKIP_ENVTEST="y"
|
||||
WORKDIR /go/src/github.com/openshift/installer
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts
|
||||
FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts
|
||||
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
|
||||
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
|
||||
# FIPS support is offered via the baremetal-installer image
|
||||
ENV GO_COMPLIANCE_EXCLUDE=".*"
|
||||
ARG TAGS=""
|
||||
|
||||
Reference in New Issue
Block a user