If a group and user with the same IDs already exist, rename the group and

recreate the inav user (for compatibility e.g. ubuntu:noble).
pyyaml is installed systemwide via apt-get also for compatibility e.g. ubuntu:noble.

Author: Lebensgefahr

Dockerfile

@@ -6,15 +6,13 @@ ARG GDB
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y git cmake make ruby gcc python3 python3-pip gcc-arm-none-eabi ninja-build
+RUN apt-get update && apt-get install -y git cmake make ruby gcc python3 python3-yaml ninja-build gcc-arm-none-eabi
 
 RUN if [ "$GDB" = "yes" ]; then apt-get install -y gdb; fi
 
-RUN pip install pyyaml
-
-# add inav user and group
-RUN addgroup --gid $GROUP_ID inav
-RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID inav
+# If a group and user with the same IDs already exist, rename the group and recreate the user after deleting the existing one.
+RUN GROUP="$(id -n -g $GROUP_ID)"; if [ -n "$GROUP" ]; then groupmod -n inav "$GROUP"; else groupadd --gid $GROUP_ID inav; fi
+RUN USER="$(id -n -u $USER_ID)"; if [ -n "$USER" ]; then userdel -r "$USER"; fi && useradd -m --uid $USER_ID --gid $GROUP_ID inav
 
 USER inav