From 17820b31c4585374bb62e0af72e93ad2ae89b37a Mon Sep 17 00:00:00 2001
From: zeke <sfpj5l17y@mozmail.com>
Date: Wed, 7 Feb 2024 10:47:36 -0800
Subject: [PATCH] Fix user and group creation for docker containers

---
 docker/common-setup.sh  | 13 -------------
 docker/nginx/Dockerfile |  5 ++++-
 docker/php/Dockerfile   |  2 ++
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/docker/common-setup.sh b/docker/common-setup.sh
index e4373971..bf30bd20 100755
--- a/docker/common-setup.sh
+++ b/docker/common-setup.sh
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-# not exactly elegant, but one container is Debian, the other is Alpine
-if [ "$1" == "php" ]; then
-   useradd -MU leftypol
-else
-   addgroup leftypol
-   adduser -DHG leftypol leftypol
-fi
 set -eu
 
 install -m 775 -o leftypol -g leftypol -d /var/www-leftypol
@@ -32,9 +25,3 @@ ln -s /code/templates/* /var/www-leftypol/templates/
 
 install -m 775 -o leftypol -g leftypol -d /var/www-leftypol/inc
 ln -s /code/inc/* /var/www-leftypol/inc/
-
-if [ "$1" = "php" ]; then
-   ln -s /code/composer.json /code/composer.lock /var/www-leftypol/ \
-   cd /var/www
-   composer install
-fi
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 1f3333b3..e58381da 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,7 +1,10 @@
 FROM nginx:1.25.3-alpine
 
 COPY . /code
-RUN /code/docker/common-setup.sh web
+RUN addgroup --system leftypol \
+   && adduser --system leftypol \
+   && adduser leftypol leftypol \
+   && /code/docker/common-setup.sh
 
 
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index c1292d1e..cb2225bb 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -36,7 +36,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     && pecl install -o -f igbinary \
     && docker-php-ext-install gd zip opcache intl pdo pdo_mysql mysqli bcmath gettext iconv mbstring curl \
     && docker-php-ext-enable igbinary redis imagick \
+    && useradd -MU leftypol \
     && /code/docker/common-setup.sh \
+    && ln -s /code/composer.json /code/composer.lock /var/www-leftypol/ \
     && cd /var/www-leftypol && composer install
 
 # RUN /code/docker/common-setup.sh php