From ad75488464df642b93dcf617a3ba7848b0be4c48 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Thu, 20 Sep 2018 17:37:41 +0200 Subject: Docker: more improvements :tada: --- contrib/Dockerfile | 3 ++- contrib/nginx/Dockerfile | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 520e1216..5d40bafb 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -26,7 +26,8 @@ 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/Dockerfile b/contrib/nginx/Dockerfile index f58dd3c2..e838d368 100644 --- a/contrib/nginx/Dockerfile +++ b/contrib/nginx/Dockerfile @@ -9,5 +9,4 @@ RUN yarn build FROM nginx:alpine COPY contrib/nginx/nginx.conf /etc/nginx/nginx.conf COPY --from=themes /app/public/assets /var/www/public/assets/ -COPY public/.htaccess /var/www/public/ RUN touch /var/www/public/index.php -- cgit v1.2.3-70-g09d2