From 39fdc2f940d5935fa36dadc6943bdff4ccdea85c Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 29 Jan 2018 13:52:35 +1100
Subject: [PATCH] Added mysql only branch

---
 .gitlab-ci.yml |  4 ++--
 Dockerfile     | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc4bd21..cd2f325 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 - build
 
 variables:
-  BRANCH: plus
+  BRANCH: mysql
   VERSION: 7.1-fpm-${BRANCH}
   CACHETAG: build-${BRANCH}
   DOCKER_REGISTRY: registry.leenooks.net
@@ -39,4 +39,4 @@ build:
   tags:
   - docker
   only:
-  - plus
+  - mysql
diff --git a/Dockerfile b/Dockerfile
index 300efc3..7fed7fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,9 @@
 # NAME leenooks/php
-# VERSION 7.1-fpm-plus
+# VERSION 7.1-fpm-mysql
 
 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 \
-	&& 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 \
-	&& pecl install imagick && docker-php-ext-enable imagick \
+RUN apt-get update \
+	&& docker-php-ext-install -j$(nproc) pdo_mysql \
 	&& rm -rf /var/lib/apt/lists/* /tmp/*
 
 RUN apt-get update && apt-get install -y openssh-server && rm -rf /var/lib/apt/lists/* \