Dockerfile og nginx konfig klargjort for å støtte ung-sak-web image build.

Legger til parametre i Dockerfile slik at build kan overstyre nødvendig konfigurasjon når ung-sak-web image skal byggast.

Author: josstn

Dockerfile

@@ -1,15 +1,19 @@
 FROM nginxinc/nginx-unprivileged:stable-alpine-slim
+# These must be set when building for ung-sak-web. Defaults are for k9-sak-web
+ARG proxyConfig=proxy.nginx
+ARG featureToggles=feature-toggles.json
+ARG appVariant=k9
 
 LABEL org.opencontainers.image.source=https://github.com/navikt/k9-sak-web
 
-ADD proxy.nginx /etc/nginx/conf.d/app.conf.template
-ADD feature-toggles.json /etc/nginx/conf.d/feature-toggles.json
+ADD $proxyConfig /etc/nginx/conf.d/app.conf.template
+ADD $featureToggles /etc/nginx/conf.d/feature-toggles.json
 ADD start-server.sh /start-server.sh
 
 ENV APP_DIR="/app" \
-  APP_PATH_PREFIX="/k9/sak" \
-  APP_CALLBACK_PATH="/k9/sak/cb" \
-  APP_URL_SAK="http://k9-sak"
+  APP_PATH_PREFIX="/$appVariant/sak" \
+  APP_CALLBACK_PATH="/$appVariant/sak/cb" \
+  APP_URL_SAK="http://$appVariant-sak"
 
 COPY dist /usr/share/nginx/html
 

proxy.nginx

@@ -44,7 +44,7 @@ server {
   # Health check for NAIS
   location = /k9/feature-toggle/toggles.json {
     add_header Content-Type application/json;
-    root /tmp/;
+    alias /tmp/feature-toggle/toggles.json;
   }
 
   location = /isAlive {

start-server.sh

@@ -12,8 +12,8 @@ _shutdown_() {
   wait "$pid"
 }
 trap _shutdown_ SIGTERM
-[ -d /tmp/k9/feature-toggle ] && echo "Feature toggle-directory finnes fra før, tilbakestiller" && rm -r /tmp/k9/feature-toggle/* || mkdir -p  /tmp/k9/feature-toggle
-envsubst < /etc/nginx/conf.d/feature-toggles.json > /tmp/k9/feature-toggle/toggles.json
+[ -d /tmp/feature-toggle ] && echo "Feature toggle-directory finnes fra før, tilbakestiller" && rm -r /tmp/feature-toggle/* || mkdir -p  /tmp/feature-toggle
+envsubst < /etc/nginx/conf.d/feature-toggles.json > /tmp/feature-toggle/toggles.json
 
 export APP_HOSTNAME="${HOSTNAME:-localhost}"
 export APP_PORT="${APP_PORT:-443}"
@@ -26,7 +26,7 @@ echo "### Nginx conf ###"
 cat /etc/nginx/conf.d/default.conf
 echo
 echo "### Feature toggles ###"
-cat /tmp/k9/feature-toggle/toggles.json
+cat /tmp/feature-toggle/toggles.json
 
 nginx -g "daemon off;" &
 pid=$!