From: ArthurHoaro Date: Wed, 7 Mar 2018 20:53:53 +0000 (+0100) Subject: Merge pull request #1097 from ArthurHoaro/fix/psr-elseif X-Git-Tag: v0.10.0~46 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=39ee93925b66b527c4386647001fadc898c52a2c;hp=d2d4f993e1e76bc68b65c48cb18476c404c97a41;p=github%2Fshaarli%2FShaarli.git Merge pull request #1097 from ArthurHoaro/fix/psr-elseif PSR: use elseif instead of else if --- diff --git a/docker/alpine/Dockerfile.latest b/docker/alpine/Dockerfile.latest index e9015c13..4724b633 100644 --- a/docker/alpine/Dockerfile.latest +++ b/docker/alpine/Dockerfile.latest @@ -42,7 +42,9 @@ RUN rm -rf /etc/php7/php-fpm.d/www.conf \ WORKDIR /var/www COPY --from=composer /app/shaarli shaarli +RUN chown -R nginx:nginx . VOLUME /var/www/shaarli/data + EXPOSE 80 ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"]