Adds missing NFS protocols

Author: reederc42

Dockerfile

@@ -5,6 +5,11 @@ ARG DEPS_IMAGE=alpine:3
 FROM --platform=linux/${ARCH} $DEPS_IMAGE AS deps
 
 ARG DEPS_IMAGE
+ARG BIN=trident_orchestrator
+ARG CLI_BIN=tridentctl
+ARG CHWRAP_BIN=chwrap.tar
+ARG NODE_PREP_BIN=node_prep
+ARG SYSWRAP_BIN=syswrap
 
 # Installs nfs-utils based on DEPS_IMAGE
 RUN --mount=type=secret,id=activation_key,env=ACTIVATION_KEY \
@@ -14,39 +19,31 @@ RUN --mount=type=secret,id=activation_key,env=ACTIVATION_KEY \
         then apk add nfs-utils; \
         else subscription-manager register --activationkey $ACTIVATION_KEY --org $ORGANIZATION && \
             yum install --repo=rhel-9-*-baseos-rpms -y nfs-utils || { cat /var/log/rhsm/rhsm.log; exit 1; }  \
-    fi; \
-    # Copy real certificates \
-    mkdir /real-certs; \
-    cp -L /etc/ssl/certs/* /real-certs/
+    fi;
+
+# Copy dependencies to the root filesystem
+RUN for dep in /bin/mount /bin/umount /sbin/mount.nfs /sbin/mount.nfs4 /etc/netconfig /etc/protocols /etc/ssl/certs/*; do \
+        mkdir -p /rootfs/$(dirname $dep) && cp -L $dep /rootfs/$dep; \
+    done
 
-# 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/%'
+# Copy NFS dependencies to the root filesystem
+RUN for bin in /sbin/mount.nfs /sbin/mount.nfs4; do \
+        ldd $bin | tr -s '[:space:]' '\n' | grep '^/' | xargs -I % sh -c 'mkdir -p /rootfs/$(dirname %) && cp -L % /rootfs/%'; \
+    done
+
+COPY ${BIN} /rootfs/trident_orchestrator
+COPY ${CLI_BIN} /rootfs/bin/tridentctl
+COPY ${NODE_PREP_BIN} /rootfs/node_prep
+COPY ${SYSWRAP_BIN} /rootfs/syswrap
+ADD ${CHWRAP_BIN} /rootfs/
 
 FROM scratch
 
 LABEL maintainers="The NetApp Trident Team" \
     app="trident.netapp.io" \
     description="Trident Storage Orchestrator"
 
-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/ /
-
-COPY --from=deps /real-certs/ /etc/ssl/certs/
-
-ARG BIN=trident_orchestrator
-ARG CLI_BIN=tridentctl
-ARG CHWRAP_BIN=chwrap.tar
-ARG NODE_PREP_BIN=node_prep
-ARG SYSWRAP_BIN=syswrap
-
-COPY ${BIN} /trident_orchestrator
-COPY ${CLI_BIN} /bin/tridentctl
-COPY ${NODE_PREP_BIN} /node_prep
-COPY ${SYSWRAP_BIN} /syswrap
-ADD ${CHWRAP_BIN} /
+COPY --from=deps /rootfs /
 
 ENTRYPOINT ["/bin/tridentctl"]
 CMD ["version"]