978 location / service restart cornercase fixup (#211)

* skyaware978: use piaware location * fix docker not being detected in fa_services.tcl /.dockerenv is not a docker standard don't rely on it the container uses a custom fa_services.tcl anyhow, just hardcode is_docker to return 1
sdr-enthusiasts · Oct 21, 2024 · 53a3625 · 53a3625
1 parent dcbf4c7
commit 53a3625
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/rootfs/etc/s6-overlay/scripts/dump1090 b/rootfs/etc/s6-overlay/scripts/dump1090
@@ -34,7 +34,7 @@ DUMP1090_CMD+=("--write-json" "/run/dump1090-fa")
 DUMP1090_CMD+=("--net-bind-address" "0.0.0.0")
 
 # use location from /var/cache/piaware/location.env
-source /var/cache/piaware/location.env || true
+source /var/cache/piaware/location.env &>/dev/null || true
 if [[ -n "$PIAWARE_LAT" ]] && [[ -n "$PIAWARE_LON" ]]; then
     DUMP1090_CMD+=("--lat" "$PIAWARE_LAT")
     DUMP1090_CMD+=("--lon" "$PIAWARE_LON")

diff --git a/rootfs/etc/s6-overlay/scripts/skyaware978 b/rootfs/etc/s6-overlay/scripts/skyaware978
@@ -23,9 +23,16 @@ fi
 
 mkdir -p /run/skyaware978
 
-set -eo pipefail
+ARGS=()
+ARGS+=(--connect "${UAT_RECEIVER_HOST:-127.0.0.1}:${UAT_RECEIVER_PORT:-30978}")
+ARGS+=(--json-dir "/run/skyaware978")
+
+# use location from /var/cache/piaware/location.env
+source /var/cache/piaware/location.env &>/dev/null || true
+if [[ -n "$PIAWARE_LAT" ]] && [[ -n "$PIAWARE_LON" ]]; then
+    ARGS+=("--lat" "$PIAWARE_LAT")
+    ARGS+=("--lon" "$PIAWARE_LON")
+fi
 
 # shellcheck disable=SC2016
-exec "${s6wrap[@]}" skyaware978 \
-  --connect "${UAT_RECEIVER_HOST:-127.0.0.1}:${UAT_RECEIVER_PORT:-30978}" \
-  --json-dir "/run/skyaware978"
+exec "${s6wrap[@]}" skyaware978 "${ARGS[@]}"
diff --git a/rootfs/usr/lib/piaware_packages/fa_services.tcl b/rootfs/usr/lib/piaware_packages/fa_services.tcl
@@ -22,9 +22,9 @@ namespace eval ::fa_services {
 	# return 1 if we have invoke-rc.d
 	proc has_invoke_rcd {} {
                 # Check if we are running on docker because no runlevel exists to use invoke-rc.d and return immediately 0
-		if {[is_docker]} {
-			logger "has_invoke_rcd: Running on docker ignoring invoke-rc.d"
-                        return 0
+        if {[is_docker]} {
+            logger "has_invoke_rcd: Running on docker ignoring invoke-rc.d"
+            return 0
 		}
 
 		if {![info exists ::invoke_rcd_path]} {
@@ -69,7 +69,8 @@ namespace eval ::fa_services {
 
         # return 1 if it looks like we're using docker
         proc is_docker {} {
-		return [file isfile /.dockerenv]
+            return 1
+            #return [file isfile /.dockerenv]
         }
 
 	# return a list of systemd service unitfiles matching pattern