From 8a789e07867b741608157810cb47b367ddb634c4 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Wed, 15 Feb 2017 10:12:18 -0500
Subject: [PATCH] Slim build config

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e6c2ebe..dc25856f 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.
-
-services:
-    - redis:latest
-
 stages:
     - test
 
@@ -17,7 +10,7 @@ test:7:
       - php composer.phar install --no-dev --ignore-platform-reqs
     image: php:7-alpine
     script:
-      - phpunit -c build --coverage-text --colors=never
+      - ./vendor/bin/phpunit -c build --coverage-text --colors=never
 
 test:7.1:
     stage: test
@@ -27,7 +20,7 @@ test:7.1:
       - php composer.phar install --no-dev --ignore-platform-reqs
     image: php:7.1-alpine
     script:
-      - phpunit -c build --coverage-text --colors=never
+      - ./vendor/bin/phpunit -c build --coverage-text --colors=never
 
 #test:hhvm:
 #    stage: test
diff --git a/build/docker_install.sh b/build/docker_install.sh
index abcd62bd..4cd9bd1a 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -12,12 +12,7 @@ apk upgrade --update && apk add --no-cache \
 	autoconf \
 	curl \
 	git \
-	libxslt-dev \
 	zlib-dev
-	
-# 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
@@ -25,4 +20,4 @@ docker-php-source extract
 pecl install xdebug
 docker-php-ext-enable xdebug
 docker-php-source delete
-docker-php-ext-install zip
\ No newline at end of file
+# docker-php-ext-install zip
\ No newline at end of file