From 522231c6c6ef6fce5c145e94ef2bc3ca9f30e166 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Fri, 4 Oct 2019 18:51:24 +0200
Subject: [PATCH] use go app to serve static assets

---
 .gitignore             |  2 +-
 build/proxy/Dockerfile | 45 ------------------------------------------
 build/proxy/nginx.conf | 16 +++++++++++----
 docker-compose.yml     |  1 +
 4 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index bcc7233..75e3c50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .vscode
 .serverless
 node_modules/
-# mkcert certificates
+public/
 *.pem
 venv/
 
diff --git a/build/proxy/Dockerfile b/build/proxy/Dockerfile
index ee23061..4cb199c 100644
--- a/build/proxy/Dockerfile
+++ b/build/proxy/Dockerfile
@@ -1,45 +1,3 @@
-FROM node:10 as auditorium
-
-COPY ./auditorium/package.json ./auditorium/package-lock.json /code/deps/
-COPY ./packages /code/packages
-WORKDIR /code/deps
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-RUN npm ci
-COPY ./auditorium /code/auditorium
-COPY ./banner.txt /code/banner.txt
-WORKDIR /code/auditorium
-RUN cp -a /code/deps/node_modules /code/auditorium/
-ENV NODE_ENV production
-RUN npm run build
-
-FROM node:10 as script
-
-COPY ./script/package.json ./script/package-lock.json /code/deps/
-COPY ./packages /code/packages
-WORKDIR /code/deps
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-RUN npm ci
-COPY ./script /code/script
-COPY ./banner.txt /code/banner.txt
-WORKDIR /code/script
-RUN cp -a /code/deps/node_modules /code/script/
-ENV NODE_ENV production
-RUN npm run build
-
-FROM node:10 as vault
-
-COPY ./vault/package.json ./vault/package-lock.json /code/deps/
-COPY ./packages /code/packages
-WORKDIR /code/deps
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-RUN npm ci
-COPY ./vault /code/vault
-COPY ./banner.txt /code/banner.txt
-WORKDIR /code/vault
-RUN cp -a /code/deps/node_modules /code/vault/
-ENV NODE_ENV production
-RUN npm run build
-
 FROM nikolaik/python-nodejs:python3.7-nodejs10 as homepage
 
 ARG siteurl
@@ -64,9 +22,6 @@ ARG robots
 ENV ROBOTS_FILE=$robots
 
 COPY --from=homepage /code/homepage/output /www/data
-COPY --from=script /code/script/dist /www/data
-COPY --from=auditorium /code/auditorium/dist /www/data/auditorium
-COPY --from=vault /code/vault/dist /www/data/vault
 COPY ./build/proxy/$ROBOTS_FILE /www/data/robots.txt
 COPY ./build/proxy/nginx.conf /etc/nginx/nginx.conf
 
diff --git a/build/proxy/nginx.conf b/build/proxy/nginx.conf
index afd2555..4208da1 100644
--- a/build/proxy/nginx.conf
+++ b/build/proxy/nginx.conf
@@ -37,13 +37,21 @@ http {
 		location /api/ {
 			proxy_pass http://server;
 			proxy_redirect off;
-			rewrite ^/api(.*)$ $1 break;
-			proxy_hide_header Content-Type;
-			add_header Content-Type "application/json";
+		}
+
+		location /vault/ {
+			proxy_pass http://server;
+			proxy_redirect off;
 		}
 
 		location /auditorium/ {
-			try_files $uri $uri/ /auditorium/index.html;
+			proxy_pass http://server;
+			proxy_redirect off;
+		}
+
+		location /script.js {
+			proxy_pass http://server;
+			proxy_redirect off;
 		}
 
 		error_page 404 /404.html;
diff --git a/docker-compose.yml b/docker-compose.yml
index fe8b059..cb6cbf2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,7 @@ services:
     volumes:
       - .:/offen
       - ./bootstrap.yml:/offen/server/bootstrap.yml
+      - ./public:/offen/server/public
       - serverdeps:/go/pkg/mod
     environment:
       POSTGRES_CONNECTION_STRING: postgres://postgres:develop@server_database:5432/postgres?sslmode=disable