From 41399fb9d91d29a18e4e42e5d16a72f19c325ece Mon Sep 17 00:00:00 2001 From: marudor Date: Thu, 20 Sep 2018 13:14:45 +0200 Subject: Assets are only needed by nginx - not php --- contrib/Dockerfile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'contrib/Dockerfile') diff --git a/contrib/Dockerfile b/contrib/Dockerfile index a47c935f..520e1216 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -3,13 +3,6 @@ COPY composer.json /app/ RUN composer --no-ansi install --no-dev --ignore-platform-reqs RUN composer --no-ansi dump-autoload --optimize -FROM node:8-alpine as themes -WORKDIR /app -COPY resources/assets/ /app/resources/assets -COPY .babelrc package.json webpack.config.js /app/ -RUN apk add --no-cache yarn -RUN yarn install -RUN yarn build # Intermediate container for less layers FROM alpine as data @@ -18,7 +11,8 @@ COPY config/ /app/config COPY db/ /app/db COPY includes/ /app/includes COPY public/ /app/public -COPY resources/ /app/resources +COPY resources/lang /app/resources/lang +COPY resources/views /app/resources/views COPY src/ /app/src COPY composer.json LICENSE package.json README.md /app/ @@ -26,17 +20,13 @@ COPY composer.json LICENSE package.json README.md /app/ COPY --from=composer /app/vendor/ /app/vendor COPY --from=composer /app/composer.lock /app/ -COPY --from=themes /app/public/assets /app/public/assets -COPY --from=themes /app/yarn.lock /app/ - RUN rm -f /app/config/config.php FROM php:7-fpm-alpine WORKDIR /var/www COPY --from=data /app/ /var/www RUN apk add --no-cache icu-dev gettext-dev && \ - docker-php-ext-install intl gettext pdo_mysql && \ - rm -r /var/www/html + docker-php-ext-install intl gettext pdo_mysql ENV TRUSTED_PROXIES 10.0.0.0/8,::ffff:10.0.0.0/8,\ 127.0.0.0/8,::ffff:127.0.0.0/8,\ -- cgit v1.2.3-70-g09d2