Uses scratch image for all base images

Author: reederc42

BUILD.md

@@ -166,6 +166,12 @@ Default: `trident-operator`
 
 Trident operator image name used to create operator image tag.
 
+`TRIDENT_DEPS_IMAGE`
+
+Default: See "DEPS_IMAGE" in ./Dockerfile
+
+Image used to get dependencies such as NFS.
+
 ## Makefile Targets
 
 ### Build Targets

Dockerfile

@@ -1,23 +1,35 @@
 ARG ARCH=amd64
+# Image for dependencies such as NFS binaries
+ARG DEPS_IMAGE=alpine:3
 
-FROM --platform=linux/${ARCH} alpine:latest AS baseimage
+FROM --platform=linux/${ARCH} $DEPS_IMAGE AS deps
 
-RUN apk add nfs-utils
+ARG DEPS_IMAGE
 
-#Get the mount.nfs4 dependency
+# Installs nfs-utils based on DEPS_IMAGE
+RUN --mount=type=secret,id=activation_key,env=ACTIVATION_KEY \
+    --mount=type=secret,id=organization,env=ORGANIZATION \
+    function unregister() { subscription-manager unregister || true; }; trap unregister EXIT; \
+    if [[ $DEPS_IMAGE =~ "alpine" ]]; \
+        then apk add nfs-utils; \
+        else subscription-manager register --activationkey $ACTIVATION_KEY --org $ORGANIZATION && \
+             yum install --repo=rhel-9-*-baseos-rpms -y nfs-utils; \
+    fi
+
+# Get the mount.nfs4 dependency
 RUN ldd /sbin/mount.nfs4 | tr -s '[:space:]' '\n' | grep '^/' | xargs -I % sh -c 'mkdir -p /nfs-deps/$(dirname %) && cp -L % /nfs-deps/%'
 RUN ldd /sbin/mount.nfs | tr -s '[:space:]' '\n' | grep '^/' | xargs -I % sh -c 'mkdir -p /nfs-deps/$(dirname %) && cp -r -u -L % /nfs-deps/%'
 
-FROM --platform=linux/${ARCH} gcr.io/distroless/static@sha256:69830f29ed7545c762777507426a412f97dad3d8d32bae3e74ad3fb6160917ea
+FROM scratch
 
 LABEL maintainers="The NetApp Trident Team" \
       app="trident.netapp.io" \
       description="Trident Storage Orchestrator"
 
-COPY --from=baseimage /bin/mount /bin/umount /bin/
-COPY --from=baseimage /sbin/mount.nfs /sbin/mount.nfs4 /sbin/
-COPY --from=baseimage /etc/netconfig /etc/
-COPY --from=baseimage /nfs-deps/ /
+COPY --from=deps /bin/mount /bin/umount /bin/
+COPY --from=deps /sbin/mount.nfs /sbin/mount.nfs4 /sbin/
+COPY --from=deps /etc/netconfig /etc/
+COPY --from=deps /nfs-deps/ /
 
 ARG BIN=trident_orchestrator
 ARG CLI_BIN=tridentctl

Dockerfile.Windows

@@ -1,7 +1,7 @@
-ARG WINDOWS_VERSION
-ARG	ARCH
+ARG WINDOWS_VERSION=ltsc2022
+ARG	ARCH=amd64
 
-FROM --platform=windows/${ARCH} mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION} as add_on
+FROM --platform=windows/${ARCH} mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION} AS add_on
 FROM --platform=windows/${ARCH} mcr.microsoft.com/windows/nanoserver:${WINDOWS_VERSION}
 
 ARG BIN=trident_orchestrator.exe

Makefile

@@ -91,6 +91,9 @@ DEFAULT_AUTOSUPPORT_IMAGE ?=
 # DEFAULT_ACP_IMAGE override the default acp image in tridentctl and operator
 DEFAULT_ACP_IMAGE ?=
 
+# TRIDENT_DEPS_IMAGE sets the image used by the Trident dockerfile to install dependencies such as NFS
+TRIDENT_DEPS_IMAGE ?=
+
 # Constants
 ALL_PLATFORMS = linux/amd64 linux/arm64 windows/amd64/ltsc2022 windows/amd64/ltsc2019 darwin/amd64
 DEFAULT_REGISTRY = docker.io/netapp
@@ -241,6 +244,9 @@ docker_build_linux = $1 build \
 	--build-arg NODE_PREP_BIN=$(call binary_path,node_prep,$2) \
 	--build-arg CHWRAP_BIN=$(call binary_path,chwrap.tar,$2) \
 	--build-arg SYSWRAP_BIN=${call binary_path,syswrap,$2} \
+	$(if $(TRIDENT_DEPS_IMAGE),--build-arg DEPS_IMAGE=$(TRIDENT_DEPS_IMAGE)) \
+	--secret id=activation_key,env=ACTIVATION_KEY \
+	--secret id=organization,env=ORGANIZATION \
 	--tag $3 \
 	--rm \
 	$(if $(findstring $(DOCKER_BUILDX_BUILD_CLI),$1),--builder trident-builder) \

contrib/docker/plugin/Dockerfile

@@ -1,6 +1,6 @@
 FROM busybox:uclibc as busybox
 
-FROM gcr.io/distroless/static@sha256:69830f29ed7545c762777507426a412f97dad3d8d32bae3e74ad3fb6160917ea
+FROM scratch
 
 LABEL maintainers="The NetApp Trident Team" \
       app="trident.netapp.io" \

operator/Dockerfile

@@ -1,6 +1,4 @@
-ARG ARCH=amd64
-
-FROM --platform=linux/${ARCH} gcr.io/distroless/static@sha256:69830f29ed7545c762777507426a412f97dad3d8d32bae3e74ad3fb6160917ea
+FROM scratch
 
 LABEL maintainers="The NetApp Trident Team" \
       app="trident-operator.netapp.io" description="Trident Operator"

utils/devices/devices.go

@@ -855,6 +855,7 @@ func (c *Client) ScanTargetLUN(ctx context.Context, deviceAddresses []models.Scs
 			"scanFile": filename,
 			"host":     deviceAddress.Host,
 		}).Debug("Invoked SCSI scan for host.")
+
 	}
 
 	return nil