From 94063af0e40741a40dcc22a5636d3bdeda2a451a Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 19 Jan 2023 00:40:36 +0000
Subject: [PATCH] Move static files to proxy container

Signed-off-by: Fred Boniface <fred@fjla.uk>
---
 .dockerignore                                  |  3 ++-
 Dockerfile                                     |  2 +-
 nginx-proxy-docker/Dockerfile                  |  3 ---
 static/.dockerignore                           |  2 ++
 static/Dockerfile                              | 18 ++++++++++++++++++
 .../nginx}/nginx.conf                          |  9 ++++-----
 6 files changed, 27 insertions(+), 10 deletions(-)
 delete mode 100644 nginx-proxy-docker/Dockerfile
 create mode 100644 static/.dockerignore
 create mode 100644 static/Dockerfile
 rename {nginx-proxy-docker => static/nginx}/nginx.conf (84%)

diff --git a/.dockerignore b/.dockerignore
index 45833f1..50f20a0 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,4 +7,5 @@ Dockerfile
 nginx-proxy-docker
 README.md
 LICENSE
-UpNext.md
\ No newline at end of file
+UpNext.md
+static
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 356833b..b6d01b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,6 @@ FROM node:19
 EXPOSE 8460
 WORKDIR /usr/src/app
 COPY ./package*.json ./
-RUN npm ci --only=production
+RUN npm ci --omit=dev
 COPY . .
 CMD [ "node", "app.js" ]
diff --git a/nginx-proxy-docker/Dockerfile b/nginx-proxy-docker/Dockerfile
deleted file mode 100644
index 05252dd..0000000
--- a/nginx-proxy-docker/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:mainline-alpine-slim
-RUN rm /etc/nginx/nginx.conf
-COPY ./nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/static/.dockerignore b/static/.dockerignore
new file mode 100644
index 0000000..9a715f5
--- /dev/null
+++ b/static/.dockerignore
@@ -0,0 +1,2 @@
+.dockerignore
+Dockerfile
\ No newline at end of file
diff --git a/static/Dockerfile b/static/Dockerfile
new file mode 100644
index 0000000..7175c57
--- /dev/null
+++ b/static/Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:latest as compressor
+RUN dnf install brotli -y
+COPY . /data/
+RUN rm -r /data/nginx
+#RUN brotli -q 9 /data/*.json
+RUN gzip -k -9 /data/*.json
+#RUN brotli -q 9 /data/styles/*.css
+RUN gzip -k -9 /data/styles/*.css
+#RUN brotli -q 9 /data/js/*.js
+RUN gzip -k -9 /data/js/*.js
+#RUN brotli -q 9 /data/*.html
+RUN gzip -k -9 /data/*.html
+
+FROM nginx:mainline-alpine-slim
+#RUN apk add nginx-mod-http-brotli
+RUN rm /etc/nginx/nginx.conf
+COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
+COPY --from=compressor /data/ /site-static/
\ No newline at end of file
diff --git a/nginx-proxy-docker/nginx.conf b/static/nginx/nginx.conf
similarity index 84%
rename from nginx-proxy-docker/nginx.conf
rename to static/nginx/nginx.conf
index 5bfc0f7..7202e3b 100644
--- a/nginx-proxy-docker/nginx.conf
+++ b/static/nginx/nginx.conf
@@ -1,5 +1,5 @@
 user  nginx;
-worker_processes  auto;
+worker_processes  1;
 
 error_log  /var/log/nginx/error.log notice;
 pid        /var/run/nginx.pid;
@@ -29,10 +29,9 @@ http {
         proxy_cache owl_cache;
 
         location / {
-            proxy_pass http://localhost:8460;
-            proxy_cache_key $scheme://$host$uri$is_args$query_string;
-            proxy_ignore_headers Cache-Control;
-            proxy_cache_valid 200 10080m;
+            root /site-static/;
+            index index.html;
+            gzip_static on;
         }
 
         location /api/ {