summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Dockerfile14
-rw-r--r--contrib/nginx/nginx.conf2
2 files changed, 10 insertions, 6 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,\
diff --git a/contrib/nginx/nginx.conf b/contrib/nginx/nginx.conf
index 96e4688f..d95c18e2 100644
--- a/contrib/nginx/nginx.conf
+++ b/contrib/nginx/nginx.conf
@@ -26,7 +26,7 @@ http {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $forwarded_proto;
index index.php;
- root /var/www/html;
+ root /var/www/public;
location / {
try_files $uri $uri/ /index.php?$args;