Skip to content

Commit 94bcabc

Browse files
author
AOS Automation Release Team
committed
Updating ose-installer-artifacts-container image to be consistent with ART for 4.17
Reconciling with https://github.com/openshift/ocp-build-data/tree/0a1310d4df1f00e3e218da6e356585997c7c0178/images/ose-installer-artifacts.yml
1 parent 28e30ea commit 94bcabc

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

images/installer-artifacts/Dockerfile.rhel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# This Dockerfile builds an image containing Mac and Linux/AMD64 versions of
22
# the installer layered on top of the cluster-native Linux installer image.
33

4-
FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
4+
FROM registry.ci.openshift.org/ocp/4.17:installer-terraform-providers AS providers
55
# We copy from the -artifacts images because they are statically linked
6-
FROM registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts AS kas-artifacts
7-
FROM registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts AS etcd-artifacts
6+
FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts
7+
FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts
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.16 AS macbuilder
11+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-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.16 AS macarmbuilder
21+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-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.16 AS linuxbuilder
31+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-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.16 AS linuxarmbuilder
41+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS linuxarmbuilder
4242
ENV GO_COMPLIANCE_EXCLUDE=".*"
4343
ARG TAGS=""
4444
WORKDIR /go/src/github.com/openshift/installer
@@ -48,14 +48,14 @@ 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.16 AS builder
51+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder
5252
ENV GO_COMPLIANCE_EXCLUDE=".*"
5353
ARG TAGS=""
5454
WORKDIR /go/src/github.com/openshift/installer
5555
COPY . .
5656
RUN go run -mod=vendor hack/build-coreos-manifest.go
5757

58-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
58+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
5959
COPY --from=macbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install
6060
COPY --from=macarmbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac_arm64/openshift-install
6161
COPY --from=linuxbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/linux_amd64/openshift-install

0 commit comments

Comments
 (0)