Skip to content

Commit

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

OCPBUGS-40412: Updating ose-installer-altinfra-container image to be consistent with ART for 4.18
  • Loading branch information
openshift-merge-bot[bot] authored Sep 6, 2024
2 parents c38d1ea + 1360279 commit 5ba2a1c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions images/installer-altinfra/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -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.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/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/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
# FIPS support is offered via the baremetal-installer image
ENV GO_COMPLIANCE_EXCLUDE=".*"
ARG TAGS="altinfra"
Expand All @@ -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.17:base-rhel9
FROM registry.ci.openshift.org/ocp/4.18: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
Expand Down

0 comments on commit 5ba2a1c

Please sign in to comment.