From 8d662c15916e69baff4c0aec623b9bc135debb7b Mon Sep 17 00:00:00 2001
From: Clement Michaud <clement.michaud34@gmail.com>
Date: Sat, 28 Jan 2017 20:21:30 +0100
Subject: [PATCH] Install libgif-dev in travisci environment

---
 .gitignore                     |  2 ++
 .travis.yml                    |  6 +++++-
 docker-compose.dev.yml         |  2 +-
 docker-compose.yml             |  3 ++-
 notifications/notification.txt |  3 ---
 scripts/check_services.sh      | 14 ++++++++++++++
 6 files changed, 24 insertions(+), 6 deletions(-)
 delete mode 100644 notifications/notification.txt
 create mode 100755 scripts/check_services.sh

diff --git a/.gitignore b/.gitignore
index 7a4b1e5aa..328b13d38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ coverage/
 config.yml
 
 npm-debug.log
+
+notifications/
diff --git a/.travis.yml b/.travis.yml
index 4fcbf7cfd..4e150744b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,17 @@ node_js:
 services:
 - docker
 - ntp
+addons:
+  apt:
+    packages:
+    - libgif-dev
 before_install: npm install -g npm@'>=2.13.5'
 script:
 - npm test
 - docker-compose build
 - docker-compose up -d
 - sleep 5
-- scripts/check_services.sh
+- ./scripts/check_services.sh
 deploy:
   provider: npm
   email: clement.michaud34@gmail.com
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 980ec7c77..bbdd7bc4d 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -6,7 +6,7 @@ services:
       - ./test:/usr/src/test
       - ./src/views:/usr/src/views
       - ./src/public_html:/usr/src/public_html
-      - ./notifications:/var/lib/auth-server/notifications
+      - ./config.yml:/etc/auth-server/config.yml:ro
 
   ldap-admin:
     image: osixia/phpldapadmin:0.6.11
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f62215fd..bf30b905e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,8 @@ services:
       - ldap
     restart: always
     volumes:
-     - ./config.yml:/etc/auth-server/config.yml:ro
+      - ./config.template.yml:/etc/auth-server/config.yml:ro
+      - ./notifications:/var/lib/auth-server/notifications
 
   ldap:
     image: dinkel/openldap
diff --git a/notifications/notification.txt b/notifications/notification.txt
deleted file mode 100644
index 19ff68363..000000000
--- a/notifications/notification.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-User: user
-Subject: Reset your password
-Link: https://localhost:8080/authentication/reset-password?identity_token=CmJ51IdJLEcVr7AbbJPANe0wmJoOcgYzPqgGOngVRIhKq1UbQUoS44FXDEXBcolz
\ No newline at end of file
diff --git a/scripts/check_services.sh b/scripts/check_services.sh
new file mode 100755
index 000000000..773ffca5d
--- /dev/null
+++ b/scripts/check_services.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+service_count=`docker ps -a | grep "Up " | wc -l`
+
+if [ "${service_count}" -eq "3" ]
+then
+  echo "Service are up and running."
+  exit 0
+else
+  echo "Some services exited..."
+  docker ps -a
+  exit 1
+fi
+