From 81e445b34d80a5b983f1e650d0190f2a9b840b33 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 1 Mar 2017 11:02:46 -0500
Subject: [PATCH] Try using the big image

---
 .gitlab-ci.yml          | 21 ++++++++-------------
 build/docker_install.sh | 12 ++++++++----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 557e008..03936cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,3 @@
-# Composer stores all downloaded packages in the vendor/ directory.
-# Do not use the following if the vendor/ directory is commited to
-# your git repository.
-cache:
-  paths:
-  - vendor/
-
 services:
     - memcached:latest
     - redis:latest
@@ -12,21 +5,23 @@ services:
 test:7:
     before_script:
       - sh build/docker_install.sh > /dev/null
-      - apk add --no-cache php7-apcu php7-memcached php7-phpdbg
-      - echo '\nextension=apcu.so\nextension=memcached.so' >> /etc/php7/php.ini
+      #- apk add --no-cache php7-apcu php7-memcached php7-phpdbg
+      #- echo '\nextension=apcu.so\nextension=memcached.so' >> /etc/php7/php.ini
       - curl -sS https://getcomposer.org/installer | php
       - php composer.phar install --ignore-platform-reqs
-    image: php:7-alpine
+    #image: php:7-alpine
+    image: php:7
     script:
       - phpdbg -qrr -- ./vendor/bin/phpunit -c build
       
 test:7.1:
     before_script:
       - sh build/docker_install.sh > /dev/null
-      - apk add --no-cache php7.1-apcu php7.1-memcached php7.1-phpdbg
-      - echo '\nextension=apcu.so\nextension=memcached.so' >> /etc/php7.1/php.ini
+      #- apk add --no-cache php7.1-apcu php7.1-memcached php7.1-phpdbg
+      #- echo '\nextension=apcu.so\nextension=memcached.so' >> /etc/php7.1/php.ini
       - curl -sS https://getcomposer.org/installer | php
       - php composer.phar install --ignore-platform-reqs
-    image: php:7.1-alpine
+    #image: php:7.1-alpine
+    image: php:7.1
     script:
       - phpdbg -qrr -- ./vendor/bin/phpunit -c build
diff --git a/build/docker_install.sh b/build/docker_install.sh
index be8d2c4..fe149dd 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -6,7 +6,11 @@
 set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
-echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories
-apk upgrade --update --no-cache \
-	curl \
-	git
+#echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories
+#apk upgrade --update --no-cache \
+#	curl \
+#	git
+
+pecl install apcu
+pecl install memcached
+docker-php-ext-enable apcu memcached
\ No newline at end of file