summaryrefslogtreecommitdiff
path: root/contrib/nginx
diff options
context:
space:
mode:
authorMichael Weimann <mail@michael-weimann.eu>2019-10-14 22:23:52 +0200
committerMichael Weimann <mail@michael-weimann.eu>2019-10-24 22:09:14 +0200
commit53ce83a272c636c4eccd043f16215d7475a2d8a9 (patch)
tree51e00aa0c768ea5b60a335b97ac64deb75517276 /contrib/nginx
parent9b08b951a2f7036519a9711ff4aa32a8709e261d (diff)
Moves docker files from contrib to docker
Diffstat (limited to 'contrib/nginx')
-rw-r--r--contrib/nginx/Dockerfile11
-rw-r--r--contrib/nginx/nginx.conf42
2 files changed, 0 insertions, 53 deletions
diff --git a/contrib/nginx/Dockerfile b/contrib/nginx/Dockerfile
deleted file mode 100644
index 9f5dcb3b..00000000
--- a/contrib/nginx/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM node:10-alpine as themes
-WORKDIR /app
-COPY .babelrc .browserslistrc package.json webpack.config.js yarn.lock /app/
-RUN yarn install
-COPY resources/assets/ /app/resources/assets
-RUN yarn build
-
-FROM nginx:alpine
-RUN mkdir -p /var/www/public/ && touch /var/www/public/index.php
-COPY contrib/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY --from=themes /app/public/assets /var/www/public/assets/
diff --git a/contrib/nginx/nginx.conf b/contrib/nginx/nginx.conf
deleted file mode 100644
index d95c18e2..00000000
--- a/contrib/nginx/nginx.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-error_log stderr;
-
-events {
- worker_connections 1024;
-}
-
-http {
- client_body_temp_path /tmp/client_body_temp;
- fastcgi_temp_path /tmp/fastcgi_temp;
- proxy_temp_path /tmp/proxy_temp;
- scgi_temp_path /tmp/scgi_temp;
- uwsgi_temp_path /tmp/uwsgi_temp;
-
- map $http_x_forwarded_proto $forwarded_proto {
- default $http_x_forwarded_proto;
- https https;
- }
-
- server {
- include mime.types;
- access_log off;
- listen [::]:80 ipv6only=off;
- proxy_redirect off;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $forwarded_proto;
- index index.php;
- root /var/www/public;
-
- location / {
- try_files $uri $uri/ /index.php?$args;
- }
-
- location ~ \.php$ {
- fastcgi_pass engelsystem:9000;
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- include fastcgi_params;
- }
- }
-}