From 672c6fdcb5dc609635a9ad1232d6f5730248d7d2 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Fri, 10 Feb 2023 11:25:00 +0100
Subject: [PATCH] Update container user config

---
 ci_images/alpine_builder.dockerfile |  6 +++---
 ci_images/bionic_builder.dockerfile | 12 ++++++------
 ci_images/f35_builder.dockerfile    |  6 +++---
 ci_images/focal_builder.dockerfile  |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ci_images/alpine_builder.dockerfile b/ci_images/alpine_builder.dockerfile
index 8672a42..19c2070 100644
--- a/ci_images/alpine_builder.dockerfile
+++ b/ci_images/alpine_builder.dockerfile
@@ -15,9 +15,9 @@ RUN apk update -q \
         gtest-dev
 
 # Create user
-RUN adduser -h /home/runner -D runner
+RUN addgroup --gid 121 runner
+RUN adduser -u 1001 -G runner -h /home/runner -D runner
 USER runner
-WORKDIR /home/runner
 ENV PATH /home/runner/.local/bin:$PATH
 RUN pip3 install meson ninja ; \
-    ln -s /usr/bin/python3 .local/bin/python
+    ln -s /usr/bin/python3 /home/runner/.local/bin/python
diff --git a/ci_images/bionic_builder.dockerfile b/ci_images/bionic_builder.dockerfile
index cefdf30..69cf8c9 100644
--- a/ci_images/bionic_builder.dockerfile
+++ b/ci_images/bionic_builder.dockerfile
@@ -32,14 +32,14 @@ RUN apt update -q \
   && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
   && pip3 install meson pytest gcovr requests distro
 
-# Create user
-RUN useradd --create-home runner
-USER runner
-WORKDIR /home/runner
-ENV PATH /home/runner/.local/bin:$PATH
-
 # Set qt515 environment (the equivalent of "source /opt/qt515/bin/qt515-env.sh")
 # RUN echo "source /opt/qt515/bin/qt515-env.sh" >> /home/runner/.bashrc
 ENV PATH=/opt/qt515/bin:$PATH \
     LD_LIBRARY_PATH=/opt/qt515/lib/x86_64-linux-gnu:/opt/qt515/lib:$LD_LIBRARY_PATH \
     PKG_CONFIG_PATH=/opt/qt515/lib/pkgconfig:$PKG_CONFIG_PATH
+
+# Create user
+RUN groupadd --gid 121 runner
+RUN useradd --uid 1001 --gid 121 --create-home runner
+USER runner
+ENV PATH /home/runner/.local/bin:$PATH
\ No newline at end of file
diff --git a/ci_images/f35_builder.dockerfile b/ci_images/f35_builder.dockerfile
index bb3fc95..5dcf261 100644
--- a/ci_images/f35_builder.dockerfile
+++ b/ci_images/f35_builder.dockerfile
@@ -22,7 +22,7 @@ RUN dnf install -y --nodocs \
   && pip3 install meson pytest requests distro
 
 # Create user
-RUN useradd --create-home runner
+RUN groupadd --gid 121 runner
+RUN useradd --uid 1001 --gid 121 --create-home runner
 USER runner
-WORKDIR /home/runner
-ENV PATH /home/runner/.local/bin:$PATH
+ENV PATH /home/runner/.local/bin:$PATH
\ No newline at end of file
diff --git a/ci_images/focal_builder.dockerfile b/ci_images/focal_builder.dockerfile
index 3998210..fc74bd1 100644
--- a/ci_images/focal_builder.dockerfile
+++ b/ci_images/focal_builder.dockerfile
@@ -28,7 +28,7 @@ RUN apt update -q \
   && pip3 install meson pytest gcovr requests distro
 
 # Create user
-RUN useradd --create-home runner
+RUN groupadd --gid 121 runner
+RUN useradd --uid 1001 --gid 121 --create-home runner
 USER runner
-WORKDIR /home/runner
-ENV PATH /home/runner/.local/bin:$PATH
+ENV PATH /home/runner/.local/bin:$PATH
\ No newline at end of file