From f1085d8c6b8223fb87432a4c5ecb1a41f935250d Mon Sep 17 00:00:00 2001
From: Mathieu Ruellan <mathieu.ruellan@gmail.com>
Date: Thu, 2 Nov 2017 20:09:28 +0100
Subject: [PATCH] Migrating to strech
---
Dockerfile | 23 ++++++++++++++++-------
README.md | 9 +++++++++
entrypoint.sh | 3 ++-
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 224df48..bcf182b 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 de3b645..e895d87 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 6713174..1b845bb 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
-
--
GitLab