init-docker-image: remove ubuntu user if it exists

bldr/bldr.py

@@ -205,7 +205,7 @@ def build(self, package_dir: Path) -> DockerImage:
     @classmethod
     def selftest(cls) -> None:
         client = create_docker_client()
-        for ubuntu_release in ['focal', 'jammy']:
+        for ubuntu_release in ['focal', 'jammy', 'noble']:
             image = DockerImage(client=client, image='ubuntu:{}'.format(ubuntu_release))
             assert image is not None, "DockerImage should be initialized without Exception"
 
@@ -214,7 +214,7 @@ def selftest(cls) -> None:
 
                 assert container.exec(command=['false']) == 1, "return code should be returned"
 
-                cmd = 'useradd -u 1000 user && su user -c whoami'   # checking for possible SELinux issues
+                cmd = 'useradd -u 1001 user && su user -c whoami'   # checking for possible SELinux issues
                 assert container.exec_run(command=['bash', '-c', cmd]) == 'user\n', "'su user' should succeed"
 
                 cmd = 'echo "deb http://archive.ubuntu.com/ubuntu {} main universe" > /etc/apt/sources.list'.format(ubuntu_release)

bldr/data/files/usr/local/bin/init-docker-image

@@ -3,6 +3,11 @@
 set -e
 echo "Preparing BLDR deb builder docker image"
 
+if getent passwd ubuntu; then
+    echo "Deleting ubuntu user"
+    userdel -r ubuntu
+fi
+
 echo "Adding non-privileged user ${NONPRIV_USER_NAME} with uid ${NONPRIV_USER_UID}"
 useradd -u ${NONPRIV_USER_UID} ${NONPRIV_USER_NAME} -m
 

test/conftest.py

@@ -2,7 +2,7 @@
 import shutil
 from pathlib import Path
 
-DEFAULT_DOCKER_IMAGES = ["ubuntu:focal", "ubuntu:jammy"]
+DEFAULT_DOCKER_IMAGES = ["ubuntu:focal", "ubuntu:jammy", "ubuntu:noble"]
 
 
 def pytest_addoption(parser):