Skip to content

Commit 0f885c1

Browse files
committed
images: libvirt: add oc to libvirt CI image
For multi-architecture compute deployments for s390x on libvirt, we need to extract cluster state and correct assets for spinning up nodes on a second architecture via oc, then spin up nodes with libvirt client. oc can be helpful for this purpose. This is analogous to the UPI installer image (images/installer/Dockerfile.upi.ci#L14,L20) Signed-off-by: Dominik Werle <[email protected]>
1 parent ff2a09f commit 0f885c1

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

images/libvirt/Dockerfile.ci

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# This Dockerfile is a used by CI to publish an installer image for creating libvirt clusters
2-
# It builds an image containing openshift-install and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments.
2+
# It builds an image containing openshift-install and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments and
3+
# oc for getting assets from an existing cluster to spin up multi-architecture compute clusters on libvirt.
34

45
FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
56

@@ -12,10 +13,13 @@ COPY . .
1213
COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
1314
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
1415

16+
FROM registry.ci.openshift.org/ocp/4.16:cli as cli
17+
1518
FROM quay.io/centos/centos:stream
1619
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
1720
COPY --from=builder /go/src/github.com/openshift/installer/images/libvirt/mock-nss.sh /bin/mock-nss.sh
1821
COPY --from=builder /go/src/github.com/openshift/installer/images/libvirt/google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
22+
COPY --from=cli /usr/bin/oc /bin/oc
1923

2024
RUN yum update -y && \
2125
yum install --setopt=tsflags=nodocs -y \

0 commit comments

Comments
 (0)