From cb046dbde2b48e4b9ffecb3b20913abdd155d8a4 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 25 Jul 2016 11:58:43 -0400
Subject: [PATCH] Add redis config file for gitlab ci tests

---
 build/docker_install.sh |  7 +++++++
 tests/redis.toml        | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 tests/redis.toml

diff --git a/build/docker_install.sh b/build/docker_install.sh
index 14aabcd5..88223f44 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -3,6 +3,9 @@
 # We need to install dependencies only for Docker
 [[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0
 
+# Where am I?
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 set -xe
 
 # Install git (the php image doesn't have it) which is required by composer
@@ -13,6 +16,10 @@ apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 lib
 curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
 chmod +x /usr/local/bin/phpunit
 
+# Move redis test config file into place
+mv "$DIR/test/redis.toml" "$DIR/app/config/redis.toml"
+
+
 # Install gd
 docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu
 docker-php-ext-install gd
diff --git a/tests/redis.toml b/tests/redis.toml
new file mode 100644
index 00000000..ea731750
--- /dev/null
+++ b/tests/redis.toml
@@ -0,0 +1,15 @@
+################################################################################
+#                         Redis Cache Configuration                            #
+################################################################################
+
+# Host or socket to connect to
+host = "redis"
+
+# Connection port
+#port = 6379
+
+# Connection password
+#password = ""
+
+# Database number
+database = 13
\ No newline at end of file