From 66929a3fd7e79a5f857de471612ba8eefd91955f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20R?= <ar@ez.no>
Date: Wed, 19 Apr 2017 11:28:34 +0200
Subject: [PATCH] Sync up docker file for PHP 7.0 with 7.1

---
 php/Dockerfile-7.0 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/php/Dockerfile-7.0 b/php/Dockerfile-7.0
index b292500..7a7a511 100644
--- a/php/Dockerfile-7.0
+++ b/php/Dockerfile-7.0
@@ -23,8 +23,7 @@ RUN apt-get update -q -y \
         libpng12-0 \
         libicu52 \
         libxslt1.1 \
-        libmemcached11 \
-        libmsgpack3 \
+        libmemcachedutil2 \
 # git & unzip needed for composer, unless we document to use dev image for composer install
 # unzip needed due to https://github.com/composer/composer/issues/4471
         unzip \
@@ -42,7 +41,6 @@ RUN set -xe \
         libicu-dev \
         libxslt1-dev \
         libmemcached-dev \
-        libmsgpack-dev \
     " \
 	&& apt-get update && apt-get install -y --force-yes $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 # Extract php source and install missing extensions
@@ -63,15 +61,15 @@ RUN set -xe \
     \
 # Install msgpack (for more efficient serialization in redis/memcached)
     && pecl install msgpack \
-    && echo "extension=msgpack.so" > ${PHP_INI_DIR}/conf.d/msgpack.ini \
+    && docker-php-ext-enable msgpack \
     \
 # Install redis
     && pecl install redis \
-    && echo "extension=redis.so" > ${PHP_INI_DIR}/conf.d/redis.ini \
+    && docker-php-ext-enable redis \
     \
 # Install memcached (as we are on Debian 8 we have libmemcached 1.0.18 which is recommended)
     && echo no | pecl install memcached \
-    && echo "extension=memcached.so" > ${PHP_INI_DIR}/conf.d/memcached.ini \
+    && docker-php-ext-enable memcached \
     \
 # Delete source & builds deps so it does not hang around in layers taking up space
     && docker-php-source delete \