diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2019-10-27 12:20:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-27 12:20:30 +0100 |
commit | 360a27016184bce3039fdbbb45b8f7b6bf02da3a (patch) | |
tree | df2a3794ae4248b8efee23d01981b2451ca4fa2e /docker/nginx | |
parent | 9b08b951a2f7036519a9711ff4aa32a8709e261d (diff) | |
parent | 545eb291b6d32c613f814eefc8e80e39899b1e90 (diff) |
Merge pull request #662 from weeman1337/feature/660-docker-dev
Improves the docker workflow
Diffstat (limited to 'docker/nginx')
-rw-r--r-- | docker/nginx/Dockerfile | 13 | ||||
-rw-r--r-- | docker/nginx/nginx.conf | 42 |
2 files changed, 55 insertions, 0 deletions
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile new file mode 100644 index 00000000..f4355af9 --- /dev/null +++ b/docker/nginx/Dockerfile @@ -0,0 +1,13 @@ +FROM nginx:alpine as es_nginx +RUN mkdir -p /var/www/public/ && touch /var/www/public/index.php +COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf + +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 es_nginx +COPY --from=themes /app/public/assets /var/www/public/assets/ diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf new file mode 100644 index 00000000..63e934bc --- /dev/null +++ b/docker/nginx/nginx.conf @@ -0,0 +1,42 @@ +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 es_php_fpm:9000; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include fastcgi_params; + } + } +} |