v1.1.2 : Travis build test integration & changes to docker deployment

2016-11-20 13:17:25 +01:00
parent 9f85415d89
commit e9ffb44b45
12 changed files with 87 additions and 23 deletions
@@ -21,8 +21,21 @@ for arg; do
 	esac
 done

+if [ "$CACHE_MANAGER" == "" ]; then
+	export CACHE_MANAGER="dumb"
+fi
+
+if [ "$CAMERAS_SUBNETWORKS" == "" ]; then
+	export CAMERAS_SUBNETWORKS="0.0.0.0"
+fi
+
+if [ "$CAMERAS_PORTS" == "" ]; then
+	export CAMERAS_PORTS="554,8554"
+fi
+
 envsubst < /cameradar/conf/cameradar.tmpl.conf.json > /cameradar/conf/cameradar.conf.json

+
 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 --silent; do