From 806c7a4f1b35947489bfc9afa600fee94d9f3875 Mon Sep 17 00:00:00 2001
From: Rafael Mello <merorafael@gmail.com>
Date: Thu, 22 Sep 2016 13:28:27 -0300
Subject: [PATCH] Added PHPUnit and redis extension changed to 3.0.0 release in
 PHP 7 image.

---
 5.6/Dockerfile |  6 +++++-
 7.0/Dockerfile | 10 ++++++----
 README.md      |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index c5ee244..c0b51b2 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -51,7 +51,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     && echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.10 \
     && pecl install apcu-4.0.10 \
-    && pecl install redis \
+    && pecl install redis-2.2.8 \
     && pecl install memcached \
     && docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/opt/oracle/instantclient_12_1,12.1 \
     && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \
@@ -78,6 +78,10 @@ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-di
             redis \
             opcache
 
+# Install PHPUnit 5.5
+RUN wget https://phar.phpunit.de/phpunit.phar -O /usr/local/bin/phpunit \
+    && chmod +x /usr/local/bin/phpunit
+
 # Clean repository
 RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/*
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
index 9bc0025..3dffb68 100644
--- a/7.0/Dockerfile
+++ b/7.0/Dockerfile
@@ -50,9 +50,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
 # Install PHP extensions
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     && echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8 \
-    && git clone https://github.com/phpredis/phpredis /usr/src/php/ext/redis \
-    && cd /usr/src/php/ext/redis && git checkout -b php7 origin/php7 \
-    && docker-php-ext-configure redis \
+    && pecl install redis \
     && git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
     && cd /usr/src/php/ext/memcached && git checkout -b php7 origin/php7 \
     && docker-php-ext-configure memcached \
@@ -74,10 +72,10 @@ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-di
             sockets \
             zip \
             memcached \
-            redis \
             pcntl \
     && docker-php-ext-enable \
             oci8 \
+            redis \
             opcache
 
 # Install APCu and APC backward compatibility
@@ -86,6 +84,10 @@ RUN pecl install apcu \
     && docker-php-ext-enable apcu --ini-name 10-docker-php-ext-apcu.ini \
     && docker-php-ext-enable apc --ini-name 20-docker-php-ext-apc.ini
 
+# Install PHPUnit 5.5
+RUN wget https://phar.phpunit.de/phpunit.phar -O /usr/local/bin/phpunit \
+    && chmod +x /usr/local/bin/phpunit
+
 # Clean repository
 RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/*
diff --git a/README.md b/README.md
index f9a6033..85e6c5d 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Resources
 ---------
 
 - composer
+- phpunit
 - wget
 - vim
 - git