Miscellaneous cleanup. (#16)

* Improve handling of temporary files.

- Verify /tmp is empty before setup runs.
- Remove leftover files in /tmp after setup completes.
- Do not delete setup file since it's persisted in a layer.

* Purge /var/lib/apt/lists/* after second install.

* Use deadsnakes GPG key in repo.

This avoids the use of pipes and the deprecated apt-key utility.

* Remove update.txt marker.

This file is no longer needed since containmint builds are not cached.

* Disable writing Python bytecode during setup.

This will reduce container image size, while having negligible impact on setup times.

Author: mattclay

Dockerfile

@@ -1,8 +1,5 @@
 FROM quay.io/bedrock/ubuntu:focal-20220801
 
-# increment the number in this file to force a full container rebuild
-COPY files/update.txt /dev/null
-
 VOLUME /sys/fs/cgroup /run/lock /run /tmp
 
 RUN apt-get update -y && \
@@ -38,9 +35,7 @@ RUN apt-get update -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# podman build fails with 'apt-key adv ...' but this works for both
-RUN curl -sL "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF23C5A6CF475977595C89F51BA6932366A755776" | apt-key add
-
+COPY files/deadsnakes.gpg /etc/apt/keyrings/deadsnakes.gpg
 COPY files/deadsnakes.list /etc/apt/sources.list.d/deadsnakes.list
 
 # Install Python versions available from the deadsnakes PPA.
@@ -61,7 +56,8 @@ RUN apt-get update -y && \
     python3.11-distutils \
     python3.11-venv \
     && \
-    apt-get clean
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN rm /etc/apt/apt.conf.d/docker-clean && \
     ln -s python2.7 /usr/bin/python2 && \
@@ -89,7 +85,7 @@ CMD ["/sbin/init"]
 
 # Install pip last to speed up local container rebuilds.
 COPY files/*.py /usr/share/container-setup/
-RUN python3.10 /usr/share/container-setup/setup.py && rm /usr/share/container-setup/setup.py
+RUN python3.10 -B /usr/share/container-setup/setup.py
 
 # Make sure the pip entry points in /usr/bin are correct.
 RUN rm -f /usr/bin/pip2 && cp -av /usr/local/bin/pip2 /usr/bin/pip2 && /usr/bin/pip2 -V && \

files/deadsnakes.gpg

@@ -1,2 +1,2 @@
-deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
-deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
+deb [signed-by=/etc/apt/keyrings/deadsnakes.gpg] http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
+deb-src [signed-by=/etc/apt/keyrings/deadsnakes.gpg] http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main

files/deadsnakes.list

@@ -83,7 +83,7 @@ def __init__(self, python: Python) -> None:
 
         directory = os.path.dirname(os.path.abspath(__file__))
 
-        self._pip_command = [python.path, os.path.join(directory, 'quiet_pip.py')]
+        self._pip_command = [python.path, '-B', os.path.join(directory, 'quiet_pip.py')]
         self._get_pip_path = f'/tmp/get_pip_{self.version.replace(".", "_")}.py'
 
     def have_get_pip(self) -> bool:

files/installer.py

@@ -1,6 +1,8 @@
 """Find installed Python interpreters and install pip in each one."""
 from __future__ import annotations
 
+import pathlib
+
 from installer import (
     Pip,
     Python,
@@ -11,9 +13,18 @@
 
 def main() -> None:
     """Main entry point."""
+    tmp = pathlib.Path('/tmp')
+
+    if unexpected := list(tmp.iterdir()):
+        raise Exception(f'Unexpected temporary files: {unexpected}')
+
     for python in iterate_pythons():
         setup_python(python)
 
+    for path in tmp.iterdir():
+        display.info(f'Removing temporary file: {path}')
+        path.unlink()
+
 
 def setup_python(python: Python) -> None:
     """Setup the specified Python interpreter."""