Merge pull request #204 from RS-PYTHON/layer-cleanup

Update layer-cleanup.sh

Author: jgaucher-cs

.github/common/resources/layer-cleanup.sh

@@ -17,16 +17,23 @@ apt-get autoclean --yes
 apt-get autoremove --yes
 
 rm -rf /var/lib/apt/lists/*
-rm -rf /etc/apt/sources.list.d/*
 rm -rf /usr/local/src/*
 
 rm -rf /var/cache/apt/*
 rm -rf /root/.cache/*
 # including /root/.cache/pip
+rm -rf /home/*/.cache/*
 rm -rf /usr/local/share/.cache/*
 # including /usr/local/share/.cache/yarn
 
 rm -rf /tmp/* /var/tmp/*
 rm -rf /opt/conda/pkgs/cache
 
+rm -rf /tmp/whl
+
+# WARNING: this removes the apt repository list. To restore it and be able to run 'apt update', 
+# you must run (works only in Debian): 
+# . /etc/os-release && echo "deb http://deb.debian.org/debian $VERSION_CODENAME main" > /etc/apt/sources.list
+rm -rf /etc/apt/sources.list.d/*
+
 exit 0

.github/dask-gateway/Dockerfile

@@ -72,6 +72,9 @@ RUN [ -f /opt/post-install-${IMAGE2BUILD}.sh ] && /opt/post-install-${IMAGE2BUIL
 
 RUN apt autoremove -y gcc && layer-cleanup.sh
 
+# Remove apt repository list and custom scripts
+RUN rm -f /etc/apt/sources.list /usr/local/bin/layer-cleanup.sh /usr/local/bin/restore-apt.sh
+
 # Add a default user
 RUN useradd -m user
 USER user

.github/dask-gateway/Dockerfile.mockup

@@ -85,6 +85,9 @@ RUN pip install opentelemetry-distro opentelemetry-exporter-otlp opentelemetry-i
 
 RUN apt update && apt install -y python3-pydot graphviz && layer-cleanup.sh
 
+# Remove apt repository list and custom scripts
+RUN rm -f /etc/apt/sources.list /usr/local/bin/layer-cleanup.sh /usr/local/bin/restore-apt.sh
+
 # Add a default user
 RUN useradd -m user
 

.github/jupyter/Dockerfile

@@ -99,6 +99,9 @@ COPY --chown=rspy:rspy ./resources/jupyter_server_config.py /tmp/jupyter_server_
 COPY resources/start-notebook.sh /usr/local/bin/
 RUN chmod 755 /usr/local/bin/start-notebook.sh
 
+# Remove apt repository list and custom scripts
+RUN rm -f /etc/apt/sources.list /usr/local/bin/layer-cleanup.sh /usr/local/bin/restore-apt.sh
+
 ENTRYPOINT ["start-notebook.sh"]
 
 EXPOSE 8888