From 58ec5350507b6ba9dbbcb4d72690733f2fbe4fac Mon Sep 17 00:00:00 2001
From: Matej Jellus <juffalow@juffalow.com>
Date: Sun, 6 Mar 2022 16:59:00 +0100
Subject: [PATCH] Update dockerfile setup

---
 Dockerfile       | 32 ++++++++++++++++++++++++++++++--
 nginx/nginx.conf | 17 -----------------
 2 files changed, 30 insertions(+), 19 deletions(-)
 delete mode 100644 nginx/nginx.conf

diff --git a/Dockerfile b/Dockerfile
index bbf6f67..bb8c9f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,10 +7,38 @@ RUN yarn install --frozen-lockfile && yarn build
 
 FROM nginx:stable-alpine
 
+RUN addgroup --gid 3000 --system juffgroup \
+  && adduser  --uid 2000 --system --ingroup juffgroup juffuser
+
+RUN chown -R juffuser:juffgroup /etc/nginx/conf.d
+RUN chown -R juffuser:juffgroup /var/log/nginx
+RUN chown -R juffuser:juffgroup /var/cache/nginx
+RUN chown -R juffuser:juffgroup /usr/share/nginx
+
+RUN touch /var/run/nginx.pid && \
+        chown -R juffuser:juffgroup /var/run/nginx.pid
+
+USER 2000:3000
+
 COPY --from=build /home/node/react-relay-example/build /usr/share/nginx/html
+
 RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
 
-EXPOSE 80
+RUN echo $'\n\
+server {\n\
+  listen 8080;\n\
+  location / {\n\
+    root   /usr/share/nginx/html;\n\
+    index  index.html index.htm;\n\
+    try_files $uri $uri/ /index.html;\n\
+  }\n\
+  error_page   500 502 503 504  /50x.html;\n\
+  location = /50x.html {\n\
+    root   /usr/share/nginx/html;\n\
+  }\n\
+}\n\
+' > /etc/nginx/conf.d/default.conf
+
+EXPOSE 8080
 
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
deleted file mode 100644
index 40a878b..0000000
--- a/nginx/nginx.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-server {
-
-  listen 80;
-
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
-  }
-
-  error_page   500 502 503 504  /50x.html;
-
-  location = /50x.html {
-    root   /usr/share/nginx/html;
-  }
-
-}