From 99791da0ecfaac757b5e8324257f2e63082a06de Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 29 Jan 2018 15:30:27 +1100
Subject: [PATCH] Refined plus build to use mysql build as a base

---
 Dockerfile | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 300efc3..d6e718e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,11 @@
 # NAME leenooks/php
 # VERSION 7.1-fpm-plus
 
-FROM php:7.1-fpm
-RUN echo "deb http://deb.debian.org/debian jessie non-free" >> /etc/apt/sources.list.d/non-free.list && apt-get update \
-	&& apt-get install -y pkg-config libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libsnmp-dev snmp-mibs-downloader libmagickwand-dev --no-install-recommends \
-	&& download-mibs \
+FROM registry.leenooks.net/leenooks/php:7.1-fpm-mysql
+
+RUN apt-get update \
+	&& apt-get install -y libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libmagickwand-dev --no-install-recommends \
 	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-jpeg-dir=/usr/include/ \
-	&& docker-php-ext-install -j$(nproc) pdo_mysql bz2 gettext sockets gmp gd pcntl snmp exif \
+	&& docker-php-ext-install -j$(nproc) bz2 gettext sockets gmp gd pcntl exif \
 	&& pecl install imagick && docker-php-ext-enable imagick \
 	&& rm -rf /var/lib/apt/lists/* /tmp/*
-
-RUN apt-get update && apt-get install -y openssh-server && rm -rf /var/lib/apt/lists/* \
-	&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp
-
-EXPOSE 9000/tcp 22/tcp
-
-COPY sshd_config.patch /tmp
-RUN (cd / && patch -p0 ) < /tmp/sshd_config.patch && rm /tmp/sshd_config.patch
-
-COPY start /usr/local/sbin
-ENTRYPOINT [ "/usr/local/sbin/start" ]
-CMD ["php-fpm"]