From d1f0ab0c739c9506c6d302b2cccf411cbfc93d46 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 15 Feb 2017 09:21:08 -0500
Subject: [PATCH] Attempt to use alpine php image

---
 .gitlab-ci.yml          | 4 ++--
 build/docker_install.sh | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bdf9763..7db72120 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ test:7:
       - bash build/docker_install.sh > /dev/null
       - curl -sS https://getcomposer.org/installer | php
       - php composer.phar install --no-dev
-    image: php:7
+    image: php:7-alpine
     script:
       - phpunit -c build --coverage-text --colors=never
       
@@ -22,7 +22,7 @@ test:7.1:
       - bash build/docker_install.sh > /dev/null
       - curl -sS https://getcomposer.org/installer | php
       - php composer.phar install --no-dev
-    image: php:7.1
+    image: php:7.1-alpine
     script:
       - phpunit -c build --coverage-text --colors=never
 
diff --git a/build/docker_install.sh b/build/docker_install.sh
index e8785741..af69587e 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -9,14 +9,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
-apt-get update -yqq
-apt-get install \
+apk upgrade --update && apk add \
+	curl \
 	git \
 	libxslt1-dev \
 	libxslt1.1 \
 	zlib1g-dev \
-	unzip \
-	-yqq
+	unzip
 
 # Install phpunit, the tool that we will use for testing
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar