From 6762ea1f2cb4b214fcd7ee9a7a0a0e0d65aba8d8 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 30 Mar 2023 00:18:11 +0200
Subject: [PATCH] docker/development: create and run as user matching executing
 user on host

---
 docker/development/Dockerfile           | 8 ++++++++
 docker/development/docker-compose.yaml  | 4 ++++
 docker/development/entrypoint-master.sh | 4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index a0a9ab4..3c69680 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -9,4 +9,12 @@ WORKDIR /app
 COPY ./requirements.txt /app/requirements.txt
 RUN pip install -r requirements.txt
 
+ARG GID
+ARG UID
+ARG USER
+
+RUN groupadd -g $GID $USER && useradd -g $GID -u $UID -m -d /app $USER
+
+USER $USER
+
 COPY ./docker /app/docker
diff --git a/docker/development/docker-compose.yaml b/docker/development/docker-compose.yaml
index f34939a..b163890 100644
--- a/docker/development/docker-compose.yaml
+++ b/docker/development/docker-compose.yaml
@@ -6,6 +6,10 @@ x-kompass:
     build:
         context: ./../../
         dockerfile: docker/development/Dockerfile
+        args:
+            UID: ${UID}
+            GID: ${UID}
+            USER: ${USER}
     env_file: docker.env
     restart: always
     depends_on:
diff --git a/docker/development/entrypoint-master.sh b/docker/development/entrypoint-master.sh
index bf24fa5..c5c218d 100755
--- a/docker/development/entrypoint-master.sh
+++ b/docker/development/entrypoint-master.sh
@@ -30,7 +30,7 @@ done
 
 cd /app
 
-if ! [ -f completed_initial_run ]; then
+if ! [ -f /tmp/completed_initial_run ]; then
     echo 'Initialising kompass master container'
 
     python jdav_web/manage.py compilemessages --locale de
@@ -38,7 +38,7 @@ if ! [ -f completed_initial_run ]; then
     # python jdav_web/manage.py makemigrations
     python jdav_web/manage.py migrate
 
-    touch completed_initial_run
+    touch /tmp/completed_initial_run
 fi
 
 cd jdav_web