From: Stephen Finucane <stephen@that.guru>
Date: Mon, 10 Mar 2025 22:27:55 +0000 (+0000)
Subject: Revert "docker: Remove remnants of .env file configuration"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6e0df14070969421d1a60db7688d88ffa62404b;p=thirdparty%2Fpatchwork.git

Revert "docker: Remove remnants of .env file configuration"

This reverts commit 359a8566dbbdfcd4463b261ecc377ed40deb6ace.
We can simply pass the '-o' / '--non-unique' argument instead.

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index c7325986..0a55b54d 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -1,13 +1,16 @@
 FROM ghcr.io/getpatchwork/pyenv:latest
 
+ARG UID=1000
+ARG GID=1000
+
 ARG TZ="Australia/Canberra"
 ENV DEBIAN_FRONTEND noninteractive
 ENV PYTHONUNBUFFERED 1
 ENV PROJECT_HOME /home/patchwork/patchwork
 ENV DJANGO_SETTINGS_MODULE patchwork.settings.dev
 
-RUN groupadd patchwork && \
-    useradd --gid=patchwork --create-home patchwork
+RUN groupadd --gid=$GID patchwork && \
+    useradd --uid=$UID --gid=$GID --create-home patchwork
 RUN rm -f /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime
 
 RUN eval "$(pyenv init -)"