CORS-3418: images: move installer images to static builds

The baremetal-installer image continues being dynamically built for FIPS support. For that reason it cannot reuse the existing `terraform-providers` image. All other images will be statically built.
openshift · Mar 28, 2024 · c35dc12 · c35dc12
1 parent 6372dde
commit c35dc12
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 3 deletions.
diff --git a/images/baremetal/Dockerfile.ci b/images/baremetal/Dockerfile.ci
@@ -1,13 +1,10 @@
 # This Dockerfile is a used by CI to publish an installer image
 # It builds an image containing openshift-install.
 
-FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
-
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS="libvirt baremetal"
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .
-COPY --from=providers /go/src/github.com/openshift/installer/terraform/bin/ terraform/bin/
 RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
 
 

diff --git a/images/infrastructure-providers/Dockerfile b/images/infrastructure-providers/Dockerfile
@@ -1,3 +1,6 @@
+# FIPS support is offered via the baremetal-installer image
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS macbuilder
 WORKDIR /go/src/github.com/openshift/installer
 COPY . .

diff --git a/images/installer-altinfra/Dockerfile.ci b/images/installer-altinfra/Dockerfile.ci
@@ -8,6 +8,8 @@
 # not be needed. 
 
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
+# FIPS support is offered via the baremetal-installer image
+ENV GO_COMPLIANCE_EXCLUDE=".*"
 ARG TAGS="altinfra"
 ARG OPENSHIFT_INSTALL_CLUSTER_API=""
 WORKDIR /go/src/github.com/openshift/installer

diff --git a/images/installer-artifacts/Dockerfile.rhel b/images/installer-artifacts/Dockerfile.rhel
@@ -3,6 +3,9 @@
 
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
 
+# FIPS support is offered via the baremetal-installer image
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS macbuilder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer

diff --git a/images/installer/Dockerfile.ci b/images/installer/Dockerfile.ci
@@ -3,6 +3,9 @@
 
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers AS providers
 
+# FIPS support is offered via the baremetal-installer image
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer

diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci
@@ -4,6 +4,9 @@
 
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
 
+# FIPS support is offered via the baremetal-installer image
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer

diff --git a/images/libvirt/Dockerfile.ci b/images/libvirt/Dockerfile.ci
@@ -4,6 +4,9 @@
 
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
 
+# FIPS support is offered via the baremetal-installer image
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS="libvirt"
 WORKDIR /go/src/github.com/openshift/installer

diff --git a/images/openstack/Dockerfile.ci b/images/openstack/Dockerfile.ci
@@ -2,6 +2,9 @@
 # It builds an image containing the openshift-install command as well as the openstack cli.
 FROM registry.ci.openshift.org/ocp/4.16:installer-terraform-providers as providers
 
+# FIPS support is offered via the baremetal-installer image
+ENV GO_COMPLIANCE_EXCLUDE=".*"
+
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
 ARG TAGS=""
 WORKDIR /go/src/github.com/openshift/installer