summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2019-08-19 10:48:11 +0200
committerIgor Scheller <igor.scheller@igorshp.de>2019-08-19 11:19:45 +0200
commit2e0c82ea05763b2932cf741734b8116de94ff3f1 (patch)
treee92015128cbe32e63e7d45296565984c0371b8f7 /contrib
parent030e1ab38d1b147aa180e1a2887764ba329a8560 (diff)
Versioned yarn.lock, fixed docker build
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Dockerfile2
-rw-r--r--contrib/nginx/Dockerfile1
2 files changed, 1 insertions, 2 deletions
diff --git a/contrib/Dockerfile b/contrib/Dockerfile
index 0e5e389f..a7fd403b 100644
--- a/contrib/Dockerfile
+++ b/contrib/Dockerfile
@@ -6,7 +6,7 @@ RUN composer --no-ansi dump-autoload --optimize
# Intermediate container for less layers
FROM alpine as data
-COPY .babelrc .browserslistrc composer.json LICENSE package.json README.md webpack.config.js /app/
+COPY .babelrc .browserslistrc composer.json LICENSE package.json README.md webpack.config.js yarn.lock /app/
COPY bin/ /app/bin
COPY config/ /app/config
COPY db/ /app/db
diff --git a/contrib/nginx/Dockerfile b/contrib/nginx/Dockerfile
index 82b6b1e6..9f5dcb3b 100644
--- a/contrib/nginx/Dockerfile
+++ b/contrib/nginx/Dockerfile
@@ -9,4 +9,3 @@ 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/
-COPY --from=themes /app/yarn.lock /var/www/