Revert "Revert accidental docker->master merge"

This reverts commit 49aba49406.
2022-02-04 15:17:08 +01:00
parent b453256916
commit 3fcc438558
9 changed files with 201 additions and 19 deletions
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -0,0 +1,4 @@
+FROM nginx:alpine
+
+RUN rm /etc/nginx/conf.d/default.conf
+COPY nginx.conf /etc/nginx/conf.d