Deployment update & Docker Hub integration

cameradar_standalone/src/tasks/print.cpp

@@ -24,7 +24,7 @@ print::run() const {
     std::vector<stream_model> results = (*cache)->get_valid_streams();
     std::ofstream file;
     bool first = true;
-    file.open("result.json");
+    file.open("/tmp/shared/result.json");
     file << "[\n";
     for (const auto& stream : results) {
         LOG_INFO_("Found a valid RTSP Stream and generated a thumbnail at : " +

deployment/Dockerfile

@@ -21,7 +21,7 @@ RUN mv cameradar_*_Release_Linux cameradar
 COPY conf /cameradar/conf
 
 COPY docker-entrypoint.sh /usr/local/bin/
-RUN ln -s /usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
+RUN ln -s /usr/local/bin/docker-entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 CMD ["/cameradar/bin/cameradar", "-c", "/cameradar/conf/cameradar.conf.json"]

deployment/docker-compose.yml

@@ -6,13 +6,12 @@ services:
     container_name: cameradar
     volumes:
       - "./cameradar_thumbnails:/tmp/thumbs"
+      - ".:/tmp/shared"
     environment:
      - CAMERAS_SUBNETWORKS=localhost
      - CAMERAS_PORTS=554,8554
-     - CACHE_MANAGER=mysql
+     - CACHE_MANAGER=dumb
      - MYSQL_ROOT_PASSWORD=root
-    depends_on:
-     - cameradar-database
   cameradar-database:
     container_name: cameradar-database
     image: mysql:5.7

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