From ac596bcbd21f44afb66154085d279d8dbc798049 Mon Sep 17 00:00:00 2001
From: Nico Kemnitz <nico@zetta.ai>
Date: Mon, 27 Jan 2025 18:38:21 +0100
Subject: [PATCH] fix(docker/Dockerfiles): fix typo, keep pip cache

---
 docker/Dockerfile.all     | 7 +------
 docker/Dockerfile.all_pcg | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/docker/Dockerfile.all b/docker/Dockerfile.all
index f7c4f6b66..da122f364 100644
--- a/docker/Dockerfile.all
+++ b/docker/Dockerfile.all
@@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   && rm -rf /root/.cache/bazel/ \
   && apt-mark auto '.*' > /dev/null \
   && apt-mark manual $savedAptMark zstd parallel coreutils libtbb2 libjemalloc2 \
-  && find /usr/local/lib /opt/conda f -executable -exec ldd '{}' ';' \
+  && find /usr/local/lib /opt/conda -type f -executable -exec ldd '{}' ';' \
       | awk '/=>/ { print $(NF-1) }' \
       | sort -u \
       | grep -v not \
@@ -31,7 +31,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
       | xargs -r apt-mark manual \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
   && rm -rf \
-        /root/.cache/pip/* \
         /tmp/* \
         /var/tmp/* \
         /usr/share/man \
@@ -40,8 +39,4 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 COPY . /opt/zetta_utils/
 
-# RUN apt-get --purge autoremove -y build-essential wget libboost-dev
-#   && apt-get clean \
-#   && rm -rf /var/lib/apt/lists/*
-
 RUN zetta --help
diff --git a/docker/Dockerfile.all_pcg b/docker/Dockerfile.all_pcg
index 73ead01c7..21fd1c966 100644
--- a/docker/Dockerfile.all_pcg
+++ b/docker/Dockerfile.all_pcg
@@ -18,10 +18,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   && cd /opt/zetta_utils \
   && ./install_zutils.py --dockerfile --mode modules --pcg \
   && rm -rf /root/.cache/bazel/ \
-  #
   && apt-mark auto '.*' > /dev/null \
   && apt-mark manual $savedAptMark zstd parallel coreutils libtbb2 libjemalloc2 \
-  && find /usr/local/lib /opt/conda f -executable -exec ldd '{}' ';' \
+  && find /usr/local/lib /opt/conda -type f -executable -exec ldd '{}' ';' \
       | awk '/=>/ { print $(NF-1) }' \
       | sort -u \
       | grep -v not \
@@ -32,7 +31,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
       | xargs -r apt-mark manual \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
   && rm -rf \
-        /root/.cache/pip/* \
         /tmp/* \
         /var/tmp/* \
         /usr/share/man \
@@ -41,8 +39,4 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 COPY . /opt/zetta_utils/
 
-# RUN apt-get --purge autoremove -y build-essential wget libboost-dev
-#   && apt-get clean \
-#   && rm -rf /var/lib/apt/lists/*
-
 RUN zetta --help