Skip to content

Commit 666a25c

Browse files
Merge pull request #7818 from openshift-bot/art-consistency-openshift-4.16-ose-installer-artifacts
OCPBUGS-24853: Updating ose-installer-artifacts-container image to be consistent with ART
2 parents c6c9922 + d61a570 commit 666a25c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.20-openshift-4.15
4+
tag: rhel-8-release-golang-1.20-openshift-4.16

images/installer-artifacts/Dockerfile.rhel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
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.15:installer-terraform-providers as providers
4+
FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
55

6-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS macbuilder
6+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS macbuilder
77
ARG TAGS=""
88
WORKDIR /go/src/github.com/openshift/installer
99
COPY . .
1010
COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/darwin_amd64 terraform/bin/darwin_amd64
1111
RUN GOOS=darwin GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
1212

13-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS macarmbuilder
13+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS macarmbuilder
1414
ARG TAGS=""
1515
WORKDIR /go/src/github.com/openshift/installer
1616
COPY . .
1717
COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/darwin_arm64 terraform/bin/darwin_arm64
1818
RUN GOOS=darwin GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
1919

20-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS linuxbuilder
20+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS linuxbuilder
2121
ARG TAGS=""
2222
WORKDIR /go/src/github.com/openshift/installer
2323
COPY . .
2424
COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/linux_amd64 terraform/bin/linux_amd64
2525
RUN GOOS=linux GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
2626

27-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS linuxarmbuilder
27+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS linuxarmbuilder
2828
ARG TAGS=""
2929
WORKDIR /go/src/github.com/openshift/installer
3030
COPY . .
3131
COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/linux_arm64 terraform/bin/linux_arm64
3232
RUN GOOS=linux GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
3333

34-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
34+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.16 AS builder
3535
ARG TAGS=""
3636
WORKDIR /go/src/github.com/openshift/installer
3737
COPY . .
3838
RUN go run -mod=vendor hack/build-coreos-manifest.go
3939

40-
FROM registry.ci.openshift.org/ocp/4.15:base
40+
FROM registry.ci.openshift.org/ocp/4.16:base
4141
COPY --from=macbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install
4242
COPY --from=macarmbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac_arm64/openshift-install
4343
COPY --from=linuxbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/linux_amd64/openshift-install

0 commit comments

Comments
 (0)