v1.1.0 : Deployment updated & Docker Hub

deployment/docker-entrypoint.sh

@@ -7,10 +7,10 @@ COL_GREEN=$ESC_SEQ"32;01m"
 
 # if command starts with an option, prepend /cameradar/bin/cameradar
 if [ "${1:0:1}" = '-' ]; then
-	set -- /cctv/bin/cctv_server "$@"
+	set -- /cameradar/bin/cameradar "$@"
 fi
 
-# skip setup if they want an option that stops cctv_server
+# skip setup if they want an option that stops cameradar
 wantHelp=
 for arg; do
 	case "$arg" in
@@ -23,9 +23,9 @@ done
 
 envsubst < /cameradar/conf/cameradar.tmpl.conf.json > /cameradar/conf/cameradar.conf.json
 
-if [ "$1" = '/cameradar/bin/cameradar' -a -z "$wantHelp" ]; then
+if [ "$CACHE_MANAGER" == "mysql" ] && [ "$1" = '/cameradar/bin/cameradar' -a -z "$wantHelp" ]; then
   echo -n "Waiting for cameradar-database to be ready..."
-  while ! mysqladmin ping -h "cameradar-database" -P3306 -p"$MYSQL_ROOT_PASSWORD" --silent; do
+  while ! mysqladmin ping -h "cameradar-database" -P3306 --silent; do
       sleep 1; echo -n "."
   done
   echo -e $COL_GREEN"ok"$COL_RESET