Skip to content

Commit

Permalink
Merge pull request openshift#9284 from openshift-bot/art-consistency-…
Browse files Browse the repository at this point in the history
…openshift-4.19-ose-installer-artifacts

OCPBUGS-45727: Updating ose-installer-artifacts-container image to be consistent with ART for 4.19
  • Loading branch information
openshift-merge-bot[bot] authored Dec 11, 2024
2 parents da04ae3 + a213aaf commit 0d08bb8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions images/installer-artifacts/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# This Dockerfile builds an image containing Mac and Linux/AMD64 versions of
# the installer layered on top of the cluster-native Linux installer image.

FROM registry.ci.openshift.org/ocp/4.18:installer-terraform-providers AS providers
FROM registry.ci.openshift.org/ocp/4.19:installer-terraform-providers AS providers
# We copy from the -artifacts images because they are statically linked
FROM registry.ci.openshift.org/ocp/4.18:installer-kube-apiserver-artifacts AS kas-artifacts
FROM registry.ci.openshift.org/ocp/4.18:installer-etcd-artifacts AS etcd-artifacts
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

# FIPS support is offered via the baremetal-installer image

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

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

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

FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxarmbuilder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS linuxarmbuilder
ENV GO_COMPLIANCE_EXCLUDE=".*"
ARG TAGS=""
ARG SKIP_ENVTEST="y"
Expand All @@ -49,14 +49,14 @@ COPY --from=kas-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux
COPY --from=etcd-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux_arm64
RUN GOOS=linux GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh

FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
ENV GO_COMPLIANCE_EXCLUDE=".*"
ARG TAGS=""
WORKDIR /go/src/github.com/openshift/installer
COPY . .
RUN go run -mod=vendor hack/build-coreos-manifest.go

FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=macbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install
COPY --from=macarmbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac_arm64/openshift-install
COPY --from=linuxbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/linux_amd64/openshift-install
Expand Down

0 comments on commit 0d08bb8

Please sign in to comment.