From 3e42296e518b55519f83f4bb8baf1ab09a8e079e Mon Sep 17 00:00:00 2001
From: Tobias O <tobias.olenyi@tum.de>
Date: Mon, 11 Nov 2024 20:23:16 +0100
Subject: [PATCH] fix(backend): remove shell wrapping

---
 docker-compose.dev.yaml       | 2 +-
 docker-compose.prod.yaml      | 2 +-
 docker-compose.yaml           | 2 +-
 scripts/backend-entrypoint.sh | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index 595c5c6..166d42d 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -13,7 +13,7 @@ services:
           target: /app/app/
         - action: rebuild
           path: backend/pyproject.toml
-    command: "fastapi DEV --host 0.0.0.0 --port 8000 app/main.py"
+    command: ["fastapi", "dev", "--host", "0.0.0.0", "--port", "8000", "app/main.py"]
     labels:
       caddy_0: http://localhost
       caddy_0.@match.path: /api /api/* /docs /docs/* /redoc /redoc/*
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index ff8e8ae..09cac13 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -21,7 +21,7 @@ services:
           caddy_0.log.output.roll_size: 10MiB
           caddy_0.log.output.roll_keep: 10
           caddy_0.log.output.roll_keep_for: 720h
-        volumes:
+        volumes: !override
             - tmvis_data:/app/data
 
 volumes:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 08ab195..ef96060 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -21,7 +21,7 @@ services:
         restart: always
         networks:
             - caddy
-        command: "fastapi run --host 0.0.0.0 --port 8000 --proxy-headers app/main.py"
+        command: ["fastapi", "run", "--host", "0.0.0.0", "--port", "8000", "--proxy-headers", "app/main.py"]
         env_file:
             - .env
         environment:
diff --git a/scripts/backend-entrypoint.sh b/scripts/backend-entrypoint.sh
index 0758a1b..e15a56e 100644
--- a/scripts/backend-entrypoint.sh
+++ b/scripts/backend-entrypoint.sh
@@ -12,11 +12,11 @@ fi
 
 echo "Starting with UID: $PUID, GID: $PGID"
 
-groupadd -g "$PGID" usergroup
-useradd -u "$PUID" -g "$PGID" -m -s /bin/bash user
+getent group usergroup >/dev/null 2>&1 || groupadd -g "$PGID" usergroup
+getent passwd user >/dev/null 2>&1 || useradd -u "$PUID" -g "$PGID" -m -s /bin/bash user
 
 # Change ownership of the volume
 chown -R user:usergroup /app
 
 # Execute the command as user
-exec gosu user "sh -c '$@'"
+exec gosu user "$@"