From 53ce83a272c636c4eccd043f16215d7475a2d8a9 Mon Sep 17 00:00:00 2001 From: Michael Weimann Date: Mon, 14 Oct 2019 22:23:52 +0200 Subject: Moves docker files from contrib to docker --- contrib/nginx/Dockerfile | 11 ----------- contrib/nginx/nginx.conf | 42 ------------------------------------------ 2 files changed, 53 deletions(-) delete mode 100644 contrib/nginx/Dockerfile delete mode 100644 contrib/nginx/nginx.conf (limited to 'contrib/nginx') 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; - } - } -} -- cgit v1.2.3-54-g00ecf