Revert clean-layer changes

Dockerfile.tmpl

@@ -44,7 +44,6 @@ RUN uv pip install --system --no-cache "pycuda"
 
 # Use a fixed apt-get repo to stop intermittent failures due to flaky httpredir connections,
 # as described by Lionel Chan at http://stackoverflow.com/a/37426929/5881346
-RUN /tmp/clean-layer.sh
 RUN sed -i "s/httpredir.debian.org/debian.uchicago.edu/" /etc/apt/sources.list && \
     apt-get update --allow-releaseinfo-change && \
     # Needed by lightGBM (GPU build)

clean-layer.sh

@@ -17,12 +17,4 @@ apt-get clean
 # Ensures the current working directory won't be deleted
 cd /usr/local/src/
 # Delete source files used for building binaries
-rm -rf /usr/local/src/*
-
-# More clean up to save disk space
-rm -rf /var/lib/apt/lists/*
-find /tmp -mindepth 1 ! -name 'clean-layer.sh' -delete 2>/dev/null || true
-rm -rf /root/.cache
-rm -rf /var/cache/apt/archives/*
-find /usr -name '*.pyc' -delete 2>/dev/null || true
-find /usr -name '__pycache__' -type d -exec rm -rf {} + 2>/dev/null || true
+rm -rf /usr/local/src/*

tpu/Dockerfile

@@ -30,7 +30,7 @@ ADD patches/kaggle_datasets.py /root/.local/lib/${PYTHON_VERSION_PATH}/site-pack
 # https://stackoverflow.com/questions/55313610/importerror-libgl-so-1-cannot-open-shared-object-file-no-such-file-or-directo
 RUN /tmp/clean-layer.sh && \
     apt-get update && \
-    apt-get install --no-install-recommends -y libavcodec61 libavformat61 libswscale8 libsm6 libxext6 && \
+    apt-get install --no-install-recommends -y ffmpeg libsm6 libxext6 && \
     /tmp/clean-layer.sh
 
 # Install all the packages together for maximum compatibility.

tpu/clean-layer.sh

@@ -19,12 +19,4 @@ apt-get clean
 # Ensures the current working directory won't be deleted
 cd /usr/local/src/
 # Delete source files used for building binaries
-rm -rf /usr/local/src/*
-
-# More clean up to save disk space
-rm -rf /var/lib/apt/lists/*
-find /tmp -mindepth 1 ! -name 'clean-layer.sh' -delete 2>/dev/null || true
-rm -rf /root/.cache
-rm -rf /var/cache/apt/archives/*
-find /usr -name '*.pyc' -delete 2>/dev/null || true
-find /usr -name '__pycache__' -type d -exec rm -rf {} + 2>/dev/null || true
+rm -rf /usr/local/src/*