From 177d26271c0423a2c90b18b95dab80eca0c3caa4 Mon Sep 17 00:00:00 2001
From: juliankatz <juliankatz@google.com>
Date: Tue, 8 Apr 2025 15:56:50 -0700
Subject: [PATCH 1/2] Add missing dependencies

This reverts commit 01451fba2b0f873915bcde26540333ed4ab6b371.
---
 Dockerfile         | 4 +++-
 hack/verify-all.sh | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 012c582d8..786e0b42f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -111,7 +111,9 @@ COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
                    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
                    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
                    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
-                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
+                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 \
+                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libzstd.so.1 \
+                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libgpg-error.so.0 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
 
 # Copy NVME support required script and rules into distroless base.
 COPY deploy/kubernetes/udev/google_nvme_id /lib/udev_containerized/google_nvme_id
diff --git a/hack/verify-all.sh b/hack/verify-all.sh
index 3edf8ce3c..c73cbcb64 100755
--- a/hack/verify-all.sh
+++ b/hack/verify-all.sh
@@ -22,5 +22,6 @@ PKG_ROOT=$(git rev-parse --show-toplevel)
 
 "${PKG_ROOT}/hack/verify-gofmt.sh"
 "${PKG_ROOT}/hack/verify-govet.sh"
+"${PKG_ROOT}/hack/verify-docker-deps.sh"
 
 make -C "${PKG_ROOT}" all

From e798bf13b5769ab1798abbbaecaf7350b91d454b Mon Sep 17 00:00:00 2001
From: juliankatz <juliankatz@google.com>
Date: Fri, 11 Apr 2025 15:13:26 -0700
Subject: [PATCH 2/2] Test commit with my new packages commented out.  Will it
 fail e2e?

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 786e0b42f..c63bdbedb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -111,9 +111,9 @@ COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
                    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
                    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmd.so.0 \
                    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
-                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 \
-                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libzstd.so.1 \
-                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libgpg-error.so.0 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
+                #    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libzstd.so.1 \
+                #    /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libgpg-error.so.0 \
+                   /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
 
 # Copy NVME support required script and rules into distroless base.
 COPY deploy/kubernetes/udev/google_nvme_id /lib/udev_containerized/google_nvme_id