Rydd opp etter fungerende nginx

navikt · Sep 30, 2021 · ade9fba · ade9fba
1 parent 93ff7cf
commit ade9fba
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 165 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,9 +2,9 @@ FROM nginxinc/nginx-unprivileged
 
 ENV NGINX_ENVSUBST_OUTPUT_DIR /tmp
 
-COPY nginx-conf-overwrite.conf /etc/nginx/conf.d/default.conf
+COPY nginx/nginx-conf-overwrite.conf /etc/nginx/conf.d/default.conf
 
 COPY build /etc/nginx/html
-COPY nginx.conf.template /etc/nginx/templates/default.conf.template
+COPY nginx/nginx.conf.template /etc/nginx/templates/default.conf.template
 
-COPY 20-envsubst-on-templates.sh /docker-entrypoint.d/
+COPY nginx/20-envsubst-on-templates.sh /docker-entrypoint.d/
diff --git a/files/default-config.nginx b/files/default-config.nginx
diff --git a/files/start-nginx.sh b/files/start-nginx.sh
diff --git a/20-envsubst-on-templates.sh → nginx/20-envsubst-on-templates.sh b/20-envsubst-on-templates.sh → nginx/20-envsubst-on-templates.sh
diff --git a/nginx-conf-overwrite.conf → nginx/nginx-conf-overwrite.conf b/nginx-conf-overwrite.conf → nginx/nginx-conf-overwrite.conf
diff --git a/nginx.conf.template → nginx/nginx.conf.template b/nginx.conf.template → nginx/nginx.conf.template