Merge pull request #25 from ke5gdb/docker-update

Add flag to disable uploading

rx/start_rx_docker.sh

@@ -26,16 +26,24 @@ fi
 : "${UDP_PORT:=0}"
 : "${WEB_PORT:=5003}"
 : "${IMAGE_PORT:=7890}"
+: "${UPLOAD_ENABLE:=1}"
 
 # Start up the SSDV Uploader script and push it into the background.
-python3 ssdvuploader.py --image_port "$IMAGE_PORT" "$MYCALL" &
-SSDV_UPLOAD_PID=$!
+if [ "$UPLOAD_ENABLE" == "1" ] ; then
+  python3 ssdvuploader.py --image_port "$IMAGE_PORT" "$MYCALL" &
+  SSDV_UPLOAD_PID=$!
+fi
 
 # Start the Web Interface Server
+NO_SONDEHUB=
+if [ "$UPLOAD_ENABLE" != "1" ] ; then
+  NO_SONDEHUB="--no_sondehub"
+fi
+
 if [ "$UDP_PORT" = "0" ]; then
-  python3 wenetserver.py "$MYCALL" --image_port "$IMAGE_PORT" -l "$WEB_PORT" &
+  python3 wenetserver.py "$MYCALL" --image_port "$IMAGE_PORT" -l "$WEB_PORT" $NO_SONDEHUB &
 else
-  python3 wenetserver.py "$MYCALL" -u "$UDP_PORT" --image_port "$IMAGE_PORT" -l "$WEB_PORT" &
+  python3 wenetserver.py "$MYCALL" -u "$UDP_PORT" --image_port "$IMAGE_PORT" -l "$WEB_PORT" $NO_SONDEHUB &
 fi
 WEB_VIEWER_PID=$!
 

start_docker.sh

@@ -33,6 +33,9 @@ GAIN=0
 # Enable this is you are intending on powering a preamplifer via coax from your RTLSDR
 BIAS=0
 
+# Upload Enable (1) or Disable (0) to control uploading to ssdv.habhub.org and SondeHub Amateur
+UPLOAD_ENABLE=1
+
 
 # Baud Rate & FSK Demod Oversampling Settings
 #
@@ -81,6 +84,7 @@ if [ "$SDR_TYPE" = "RTLSDR" ] ; then
 		-e IMAGE_PORT=$IMAGE_PORT \
 		-e WEB_PORT=$WEB_PORT \
 		-e SDR_TYPE=$SDR_TYPE \
+		-e UPLOAD_ENABLE=$UPLOAD_ENABLE \
 		-v ~/wenet/rx_images/:/opt/wenet/rx_images/ \
 		--device /dev/bus/usb \
 		-p $WEB_PORT:$WEB_PORT \
@@ -100,6 +104,7 @@ elif [ "$SDR_TYPE" = "KA9Q" ] ; then
 		-e IMAGE_PORT=$IMAGE_PORT \
 		-e WEB_PORT=$WEB_PORT \
 		-e SDR_TYPE=$SDR_TYPE \
+		-e UPLOAD_ENABLE=$UPLOAD_ENABLE \
 		-v ~/wenet/rx_images/:/opt/wenet/rx_images/ \
 		-v /var/run/dbus:/var/run/dbus \
 		-v /var/run/avahi-daemon/socket:/var/run/avahi-daemon/socket \