From d2b02fac37949657b848d36f82a57aa55749a162 Mon Sep 17 00:00:00 2001
From: root <root@docker.cabillot.work.lan>
Date: Mon, 6 Nov 2017 19:32:14 +0100
Subject: [PATCH] =?UTF-8?q?passage=20=C3=A0=20www/phpapache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 24ec9d0..28b53bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,35 +1,11 @@
-FROM "php:7.1-apache"
+ARG  VERSION=latest
+FROM "registry.cabillot.eu/www/phpapache":${VERSION}
+MAINTAINER "Julien Cabillot <dockerimages@cabillot.eu>"
 
-WORKDIR "/var/www"
-
-RUN sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \
-    sed -i'' 's/^<VirtualHost \*:80>$/<VirtualHost *:8080>/' '/etc/apache2/sites-enabled/000-default.conf' && \
-    apt-get update && \
+RUN apt-get update && \
     apt-get -y install libpng12-dev git && \
     docker-php-ext-install gd && \
     apt-get clean all && \
     a2enmod headers && \
-    rm -rf "/usr/share/doc/*" \
-       "/var/cache/*" \
-       "/var/lib/apt/lists/*" \
-       "/usr/src/*" \
-       "/var/cache/*" \
-       "/var/log/"{apt/*,dpkg.log} \
-       "/var/www/html" \
-       "/tmp/*" && \
-    git clone "https://github.com/blueimp/jQuery-File-Upload.git" "html"
-
-RUN chown -R "www-data":"www-data" "/var/www/html"
-
-# Add Tini
-ENV "TINI_VERSION" "v0.16.1"
-ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
-RUN chmod +x "/tini"
-ENTRYPOINT ["/tini", "--"]
-
-USER "www-data"
-
-CMD [ "docker-php-entrypoint", "apache2-foreground" ]
-
-HEALTHCHECK --interval="10s" \
-    CMD curl --fail "http://localhost:8080" || exit 1
+    rmdir "/var/www/html" && \
+    git clone "https://github.com/blueimp/jQuery-File-Upload.git" "/var/www/html"