From 0127d65dfc9a173295a498a79b3e1c6fd44df30c Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 28 Feb 2017 13:17:06 -0500
Subject: [PATCH] Simplify gitlab ci setup

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f515ebaa..db5a973c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ test:7:
     stage: test
     before_script:
       - sh build/docker_install.sh > /dev/null
+      - apk add --no-cache php7-phpdbg
       - curl -sS https://getcomposer.org/installer | php
       - php composer.phar install --no-dev --ignore-platform-reqs
     image: php:7-alpine
@@ -16,6 +17,7 @@ test:7.1:
     stage: test
     before_script:
       - sh build/docker_install.sh > /dev/null
+      - apk add --no-cache php7.1-phpdbg
       - curl -sS https://getcomposer.org/installer | php
       - php composer.phar install --no-dev --ignore-platform-reqs
     image: php:7.1-alpine
diff --git a/build/docker_install.sh b/build/docker_install.sh
index 58ada2f8..8599377c 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -6,20 +6,7 @@
 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 && apk add --no-cache \
-	g++ \
-	make \
-	autoconf \
 	curl \
-	git
-	
-# Install phpunit, the tool that we will use for testing
-curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
-chmod +x /usr/local/bin/phpunit
-
-# Install extensions
-# Install xdebug for coverage report
-docker-php-source extract
-pecl install xdebug
-docker-php-ext-enable xdebug
-docker-php-source delete
+	git
\ No newline at end of file