summaryrefslogtreecommitdiff
path: root/contrib/nginx
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2019-07-28 18:48:58 +0200
committerGitHub <noreply@github.com>2019-07-28 18:48:58 +0200
commit1da69bebd9687dd415df591f7dd43803898ead9e (patch)
treeb8c8e6e178e31ba86b7dcff497697c9bdc16258c /contrib/nginx
parentaa11bead7cff72daa2ce71a03701d6d2875d7ec4 (diff)
parentc7deeb9368a6dad4e60ab80d0d7a98713d31a8b9 (diff)
Merge pull request #629 from MyIgel/docker-improvements
Docker/Release: Add more state files, improved Dockerfiles
Diffstat (limited to 'contrib/nginx')
-rw-r--r--contrib/nginx/Dockerfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/nginx/Dockerfile b/contrib/nginx/Dockerfile
index 74907326..3fe424aa 100644
--- a/contrib/nginx/Dockerfile
+++ b/contrib/nginx/Dockerfile
@@ -1,12 +1,13 @@
FROM node:8-alpine as themes
WORKDIR /app
RUN apk add --no-cache yarn
-COPY .babelrc package.json webpack.config.js /app/
+COPY .babelrc .browserslistrc package.json webpack.config.js /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/
-RUN touch /var/www/public/index.php
+COPY --from=themes /app/yarn.lock /var/www/