From 8bb6b9e6c163d23ffd5e89bf09ce46a265b764ce Mon Sep 17 00:00:00 2001
From: Eike Ahmels <eike.ahmels@tu-dortmund.de>
Date: Wed, 27 Oct 2021 14:12:11 +0200
Subject: [PATCH] FIX: dockerfiles

---
 api/Dockerfile      | 2 +-
 docker-compose.yaml | 2 +-
 web/Dockerfile      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index e691b3b..d3e6b32 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3-buster
 
 RUN addgroup --gid 1000 mainsail
-RUN useradd -rm -d /home/mainsail -u 1000 --gid 1000 mainsail
+RUN useradd -rm -d /home/mainsail -u 1000 -g 1000 mainsail
 
 RUN apt-get update
 RUN apt-get install -y sudo wget cmake swig git supervisor
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a6315b5..9da542b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,7 +12,7 @@ services:
       dockerfile: Dockerfile
       context: web
     ports:
-      - '80:80/tcp'
+      - '8080:80/tcp'
     networks:
       - mainsail_net
     volumes:
diff --git a/web/Dockerfile b/web/Dockerfile
index 013fdfb..561bde2 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,7 +1,7 @@
 FROM nginx:1
 
-RUN addgroup -g 1000 mainsail
-RUN useradd -rm -u 1000 -G mainsail -h /home/mainsail mainsail
+RUN addgroup --gid 1000 mainsail
+RUN useradd -rm -d /home/mainsail -u 1000 -g 1000 mainsail
 
 COPY nginx/common_vars.conf /etc/nginx/conf.d/common_vars.conf
 COPY nginx/upstreams.conf /etc/nginx/conf.d/upstreams.conf