diff --git a/Dockerfile b/Dockerfile index 224df48ce55f98466d9389dcf0660d520333f188..bcf182b174d7420e6d8fb4d5c42713f26461705e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:wheezy-slim +FROM debian:stretch-slim MAINTAINER Mathieu Ruellan <mathieu.ruellan@gmail.com> @@ -8,17 +8,26 @@ ENV HOME /root ARG PIWIGO_VERSION="2.9.2" RUN apt-get update \ - && apt-get upgrade -yy \ - && apt-get install apache2 libapache2-mod-php5 -yy \ - && apt-get install -yy php5-mysql imagemagick wget unzip \ - && apt-get install -yy php5-gd php5-ffmpeg dcraw mediainfo ffmpeg \ - && apt-get install -yy php5-gd php5-curl php5-ffmpeg dcraw mediainfo ffmpeg \ + && apt-get install -yy \ + apache2 \ + libapache2-mod-php \ + php-gd \ + php-curl \ + php-mysql \ + php-mbstring \ + php-xml \ + dcraw \ + mediainfo \ + ffmpeg\ + imagemagick \ + wget \ + unzip \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN wget -q -O piwigo.zip http://piwigo.org/download/dlcounter.php?code=$PIWIGO_VERSION && \ unzip piwigo.zip && \ rm /var/www/* -rf && \ - mv piwigo/* /var/www && \ + mv piwigo/* /var/www/ && \ rm -r piwigo* ADD php.ini /etc/php5/apache2/php.ini diff --git a/README.md b/README.md index de3b645f4ed094b89a2c7113583d4354717b91cb..e895d873f763f1fcaa54f9719e3fb59832a2efbf 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,15 @@ This is an image for piwigo, linked with a mysql database. Data must be stored on a volume. +## Features +- Easy deployment of Piwigo with a docker-compose. + +## Changes +- Upgrade to debian:stretch +- Upgrade to Piwigo 2.9.2 + +## Deployment + Edit this `docker-compose.yml` and launch with the command `$ docker-compose up -d ` ``` diff --git a/entrypoint.sh b/entrypoint.sh index 6713174e416edf6419218ec365d364127d17fd04..1b845bb3ba9241b9c6e8be46ab3c31cbf13e0aa9 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,8 +5,9 @@ for d in $(ls /template); do done +sed -i "s/\/var\/www\/html/\/var\/www/g" /etc/apache2/sites-enabled/000-default.conf + chown -R www-data:www-data /var/www source /etc/apache2/envvars apache2ctl -D FOREGROUND -