From 4273179f43093ac1ec61d1d0633b9360ae0bbb7a Mon Sep 17 00:00:00 2001
From: Stefan Kraus <stefan.kraus@methodpark.de>
Date: Sat, 8 May 2021 11:16:59 +0200
Subject: [PATCH] Fix Dockerfile permission issues

---
 frontend/Dockerfile | 8 ++------
 server/Dockerfile   | 7 ++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 87e80c5..c219e8c 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -7,14 +7,10 @@ USER $USER
 
 WORKDIR /home/$USER/
 
-COPY package*.json ./
+COPY --chown=$USER package*.json ./
 RUN npm install
 
-COPY --chown=$USER . .
-RUN ls -lah
-
-ENV PORT 8430
-EXPOSE 8430
+COPY --chown=$USER . ./
 
 ENV PORT 8430
 EXPOSE 8430
diff --git a/server/Dockerfile b/server/Dockerfile
index 5da2d09..6def6a8 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,13 +1,14 @@
 FROM python:3.9.1-alpine3.12
 
 ARG USER=default
-
 RUN adduser -D $USER
-
 USER $USER
 WORKDIR /home/$USER
 
-ADD . /
+COPY --chown=$USER:$USER . ./
+
 RUN pip3 install --user -r ./requirements.txt
 
+EXPOSE 8432
+
 CMD ["./server.py"]
-- 
GitLab