diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-02 17:56:19 +0200 |
|---|---|---|
| committer | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-02 17:56:19 +0200 |
| commit | 8e0afd4d594bbec3cad835753885bca89cecc4d3 (patch) | |
| tree | 2fd7a3c3097f912251d57bcb1cf23b991b8fe4b8 /contrib/Dockerfile | |
| parent | a103bc06e28f5eca6ba9c28c81ae1227d689f224 (diff) | |
| parent | ffd81f22b636e77a3c7e2428c0df043e8fb53870 (diff) | |
Merged build-docker-ci to master
Diffstat (limited to 'contrib/Dockerfile')
| -rw-r--r-- | contrib/Dockerfile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 9b218cf8..268f9218 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -1,7 +1,7 @@ FROM composer AS composer COPY composer.json /app/ -RUN composer install --no-dev -RUN composer dump-autoload --optimize +RUN composer --no-ansi install --no-dev +RUN composer --no-ansi dump-autoload --optimize FROM node:8-alpine as themes WORKDIR /app @@ -17,22 +17,26 @@ COPY config/ /app/config COPY db/ /app/db COPY includes/ /app/includes COPY locale/ /app/locale -COPY public/ /app/html +COPY public/ /app/public COPY src/ /app/src COPY templates/ /app/templates +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/html/assets +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 + docker-php-ext-install intl gettext pdo_mysql && \ + rm -r /var/www/html 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,\ |