diff options
Diffstat (limited to 'docker/nginx')
| -rw-r--r-- | docker/nginx/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/nginx/nginx.conf | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 47b3d50e..f4355af9 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,3 +1,7 @@ +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/ @@ -5,7 +9,5 @@ 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 docker/nginx/nginx.conf /etc/nginx/nginx.conf +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 index d95c18e2..63e934bc 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -33,7 +33,7 @@ http { } location ~ \.php$ { - fastcgi_pass engelsystem:9000; + fastcgi_pass es_php_fpm:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; |