Tidying up GitLab CI file

.gitlab-ci.yml

@@ -1,21 +1,45 @@
-before_script:
+.docker_boostrap: &docker_boostrap |
-- bash test/docker_install.sh > /dev/null
+  [[ ! -e /.dockerenv ]] && exit 0
-- cp test/misc/redis.conf /usr/local/etc/redis/redis.conf
+  set -xe
+    
+  # Install git (the php image doesn't have it) which is required by composer
+  apt-get update -yq
+  apt-get install git redis-server php-redis -y
+
+  # Install phpunit, the tool that we will use for testing
+  curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
+  chmod +x /usr/local/bin/phpunit
+
+  # Install mysql driver
+  # Here you can install any other extension that you need
+  docker-php-ext-install redis
 
 # Test PHP 7.0
 test:7.0:
   image: php:7.0
+  before_script:
+    - *docker_boostrap
   script:
     - phpunit --configuration phpunit.xml.dist
+  tag:
+    - docker
 
 # Test PHP 7.2
 test:7.1:
   image: php:7.1
+  before_script:
+    - *docker_boostrap
   script:
     - phpunit --configuration phpunit.xml.dist
+  tag:
+    - docker
 
 # Test PHP 7.2
 test:7.2:
   image: php:7.2
+  before_script:
+    - *docker_boostrap
   script:
     - phpunit --configuration phpunit.xml.dist
+  tag:
+    - docker

test/docker_install.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# We need to install dependencies only for Docker
-[[ ! -e /.dockerenv ]] && exit 0
-
-set -xe
-
-# Install git (the php image doesn't have it) which is required by composer
-apt-get update -yqq
-apt-get install git redis php-redis -yqq
-
-# Install phpunit, the tool that we will use for testing
-curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
-chmod +x /usr/local/bin/phpunit
-
-# Install mysql driver
-# Here you can install any other extension that you need
-docker-php-ext-install redis

test/misc/redis.conf

@@ -1,8 +0,0 @@
-daemonize yes
-pidfile ./redis.pid
-port 6379
-bind 127.0.0.1
-timeout 300
-dbfilename dump.rdb
-dir ./
-loglevel debug