From 574166aa22782ac1c2a9d097dd2b29cfe4e88d05 Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Thu, 17 Apr 2025 14:14:19 -0400 Subject: [PATCH] images/: remove infrastructure-providers image Removes the infrastructure-providers image, which was an intermediary image used for building terraform. Now that Terraform is no longer used, we can safely remove the image. --- images/infrastructure-providers/Dockerfile | 32 ---------------------- images/installer/Dockerfile.upi.ci | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 images/infrastructure-providers/Dockerfile diff --git a/images/infrastructure-providers/Dockerfile b/images/infrastructure-providers/Dockerfile deleted file mode 100644 index d8b9ca98f7..0000000000 --- a/images/infrastructure-providers/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -# FIPS support is offered via the baremetal-installer image - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS macbuilder -ENV GO_COMPLIANCE_EXCLUDE=".*" -WORKDIR /go/src/github.com/openshift/installer -COPY . . -RUN CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 make -C terraform - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS macarmbuilder -ENV GO_COMPLIANCE_EXCLUDE=".*" -WORKDIR /go/src/github.com/openshift/installer -COPY . . -RUN CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 make -C terraform - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS linuxbuilder -ENV GO_COMPLIANCE_EXCLUDE=".*" -WORKDIR /go/src/github.com/openshift/installer -COPY . . -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make -C terraform - -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS linuxarmbuilder -ENV GO_COMPLIANCE_EXCLUDE=".*" -WORKDIR /go/src/github.com/openshift/installer -COPY . . -RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 make -C terraform - -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 -WORKDIR /go/src/github.com/openshift/installer -COPY --from=macbuilder /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/ -COPY --from=macarmbuilder /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/ -COPY --from=linuxbuilder /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/ -COPY --from=linuxarmbuilder /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/ diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index 4c05966885..63fbafb564 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -1,5 +1,5 @@ # This Dockerfile is used by CI to test UPI platforms for OpenShift Installer -# It builds an image containing binaries like jq, terraform, awscli, oc, etc. to allow bringing up UPI infrastructure. +# It builds an image containing binaries like jq, awscli, oc, etc. to allow bringing up UPI infrastructure. # It also contains the `upi` directory that contains various terraform and cloud formation templates that are used to create infrastructure resources. # We copy from the -artifacts images because they are statically linked