From 85c816c8cb703b0ead3d369eadc22832dffa74f8 Mon Sep 17 00:00:00 2001
From: Brendan LE GLAUNEC <brendan.le-glaunec@epitech.eu>
Date: Fri, 3 Jun 2016 09:07:07 +0200
Subject: [PATCH] Fix issue with MySQL & deployment

---
 cameradar_standalone/conf/cameradar.conf.json | 2 +-
 deployment/docker-compose.yml                 | 4 ++--
 deployment/run.sh                             | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cameradar_standalone/conf/cameradar.conf.json b/cameradar_standalone/conf/cameradar.conf.json
index 64b20fa..cc18536 100644
--- a/cameradar_standalone/conf/cameradar.conf.json
+++ b/cameradar_standalone/conf/cameradar.conf.json
@@ -21,5 +21,5 @@
   // if you're not familiar with Docker, only change the
   // cache_manager_name value
   "cache_manager_path" : "../cache_managers",
-  "cache_manager_name" : "mysql"
+  "cache_manager_name" : "dumb"
 }
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index dce4f80..5646369 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -6,8 +6,8 @@ cameradar:
     - "./conf:/tmp/conf:ro"
     - "./cameradar_thumbnails:/tmp/cameradar_thumbnails"
   links:
-   - ext_cctv_mysql
-ext_cctv_mysql:
+   - mysql
+mysql:
   image: mysql:5.7
   environment:
    MYSQL_ROOT_PASSWORD: root
diff --git a/deployment/run.sh b/deployment/run.sh
index a1a1b00..08eb1c4 100755
--- a/deployment/run.sh
+++ b/deployment/run.sh
@@ -27,12 +27,18 @@ echo -e $COL_GREEN"ok"$COL_RESET
 # container. The container has to be linked in docker-compose.yml for cameradar
 # to be able to interact with it.
 echo -n "replacing mysql host and port in configuration "
-sed -i s#__MYSQL_ADDR__#ext_cctv_mysql#g $CONF
+sed -i s#__MYSQL_ADDR__#mysql#g $CONF
 
 # Reaplce 3306 with the port of your DB
 sed -i s#__MYSQL_PORT__#3306#g $CONF
 echo -e $COL_GREEN"ok"$COL_RESET
 
+echo -n "waiting for mysql to be ready "
+while ! mysqladmin ping -h"mysql" -P3306 --silent; do
+    sleep 1
+done
+echo -e $COL_GREEN"ok"$COL_RESET
+
 /cameradar/bin/cameradar -l 1 -c /conf/cameradar.conf.json &
 cameradar_pid=$!