From 707e67918b523a45f798fc397133ad04d0f203ed Mon Sep 17 00:00:00 2001
From: Joel DeTeves <joel@perfectleap.com>
Date: Sat, 15 Jan 2022 19:12:04 -0800
Subject: [PATCH] Switch tactical-frontend to nginx-unprivileged container

---
 docker/containers/tactical-frontend/dockerfile    | 10 ++++++++--
 docker/containers/tactical-frontend/entrypoint.sh |  5 +----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docker/containers/tactical-frontend/dockerfile b/docker/containers/tactical-frontend/dockerfile
index f4e96a8b..658c383c 100644
--- a/docker/containers/tactical-frontend/dockerfile
+++ b/docker/containers/tactical-frontend/dockerfile
@@ -15,10 +15,12 @@ RUN echo "DOCKER_BUILD=1" > .env
 RUN sed -i '/<\/head>/i <script src="\/env-config.js"><\/script>' src/index.template.html
 RUN npm run build
 
-FROM nginx:stable-alpine
+FROM nginxinc/nginx-unprivileged:stable-alpine
 
 ENV PUBLIC_DIR /usr/share/nginx/html
 
+USER root
+
 RUN apk add --no-cache bash
 SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
 
@@ -27,4 +29,8 @@ COPY --from=builder /home/node/app/dist/ ${PUBLIC_DIR}
 COPY docker/containers/tactical-frontend/entrypoint.sh /docker-entrypoint.d/
 RUN chmod +x /docker-entrypoint.d/entrypoint.sh
 
-EXPOSE 80
+RUN chown -R nginx:nginx /usr/share/nginx/html
+
+USER nginx
+
+EXPOSE 8080
diff --git a/docker/containers/tactical-frontend/entrypoint.sh b/docker/containers/tactical-frontend/entrypoint.sh
index ecbab324..1b9a9988 100644
--- a/docker/containers/tactical-frontend/entrypoint.sh
+++ b/docker/containers/tactical-frontend/entrypoint.sh
@@ -12,7 +12,7 @@ echo "window._env_ = {PROD_URL: \"https://${API_HOST}\"}" >> ${PUBLIC_DIR}/env-c
 
 nginx_config="$(cat << EOF
 server {
-  listen 80;
+  listen 8080;
   charset utf-8;
 
   location / {
@@ -21,9 +21,6 @@ server {
     add_header Cache-Control "no-store, no-cache, must-revalidate";
     add_header Pragma "no-cache";
   }
-
-  error_log /var/log/nginx/app-error.log;
-  access_log /var/log/nginx/app-access.log;
 }
 EOF
 )"