fixup: delete ubuntu user first and run all commands in the same step

Author: targos

ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2

@@ -32,9 +32,10 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
 RUN python3 -m venv /usr/local/venv
 RUN pip3 install tap2junit=={{ tap2junit_version }}
 
-RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
-
-RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
+# Delete the default ubuntu user so we can use its UID/GID (1000) if necessary.
+RUN deluser ubuntu && \
+    addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} && \
+    adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
 
 VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
 

ansible/roles/docker/templates/ubuntu2404_armv7l.Dockerfile.j2

@@ -29,9 +29,10 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y ccache \
 RUN python3 -m venv /usr/local/venv
 RUN pip3 install tap2junit=={{ tap2junit_version }}
 
-RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
-
-RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
+# Delete the default ubuntu user so we can use its UID/GID (1000) if necessary.
+RUN deluser ubuntu && \
+    addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} && \
+    adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
 
 VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
 

ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2

@@ -34,9 +34,10 @@ RUN apt-get update && apt-get install apt-utils -y && \
 RUN python3 -m venv /usr/local/venv
 RUN pip3 install tap2junit=={{ tap2junit_version }}
 
-RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
-
-RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
+# Delete the default ubuntu user so we can use its UID/GID (1000) if necessary.
+RUN deluser ubuntu && \
+    addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} && \
+    adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
 
 ENV ICU69DIR=/opt/icu-69.1 \
     ICU71DIR=/opt/icu-71.1 \