iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Docker: more improvements 🎉

This commit is contained in:
Igor Scheller 2018-09-20 17:37:41 +02:00 committed by msquare
parent 8eee97f3ad
commit ad75488464
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/Dockerfile
View File

@ -26,7 +26,8 @@ FROM php:7-fpm-alpine
WORKDIR /var/www WORKDIR /var/www
COPY --from=data /app/ /var/www COPY --from=data /app/ /var/www
RUN apk add --no-cache icu-dev gettext-dev && \ 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,\ 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,\ 127.0.0.0/8,::ffff:127.0.0.0/8,\

1
contrib/nginx/Dockerfile
View File

@ -9,5 +9,4 @@ RUN yarn build
FROM nginx:alpine FROM nginx:alpine
COPY contrib/nginx/nginx.conf /etc/nginx/nginx.conf COPY contrib/nginx/nginx.conf /etc/nginx/nginx.conf
COPY --from=themes /app/public/assets /var/www/public/assets/ COPY --from=themes /app/public/assets /var/www/public/assets/
COPY public/.htaccess /var/www/public/
RUN touch /var/www/public/index.php RUN touch /var/www/public/index.php