Merge branch 'docker-swarm-dev-fei' into 'master'

Updates to add Docker Swarm compatibility with front-end devices

See merge request !3

Author: Josh Schindehette

Dockerfiles/bu353s4.Dockerfile

@@ -58,15 +58,15 @@ RUN yum install -y \
 
 ENV DOMAINNAME ""
 ENV GPS_PORT   ""
-ENV NODENAME   "" 
+ENV NODENAME   ""
 
 # Set config file to executable
 RUN chmod a+x /var/redhawk/sdr/dev/devices/BU353S4/nodeconfig.py
 
 # Add script for configuring the node
 ADD files/bu353s4-node-init.sh /root/bu353s4-node-init.sh
 RUN chmod u+x /root/bu353s4-node-init.sh && \
-	echo "/root/bu353s4-node-init.sh" | tee -a /root/.bashrc
+	echo "source /root/bu353s4-node-init.sh" | tee -a /root/.bashrc
 
 # BU353S4 Supervisord script and 'exit' event listener
 ADD files/supervisord-bu353s4.conf /etc/supervisor.d/bu353s4.conf

Dockerfiles/files/bu353s4-node-init.sh

@@ -23,6 +23,8 @@ function print_option() {
 	printf " ---> %-20s %-20s\n" $1 $2
 }
 
+export NODENAME=${NODENAME:-MyGps_$(hostname)}
+
 BU353S4_CONFIG_ARGS="--noinplace --domainname=${DOMAINNAME} --nodename=${NODENAME} --serialport=${GPS_PORT}"
 
 if ! [ -d $SDRROOT/dev/nodes/${NODENAME} ]; then
@@ -32,4 +34,3 @@ if ! [ -d $SDRROOT/dev/nodes/${NODENAME} ]; then
 else
 	echo BU353S4 Node already configured
 fi
-

Dockerfiles/files/rtl2832u-node-init.sh

@@ -23,6 +23,8 @@ function print_option() {
 	printf " ---> %-20s %-20s\n" $1 $2
 }
 
+export NODENAME=${NODENAME:-MyRtlsdr_$(hostname)}
+
 RTL2832U_CONFIG_ARGS="--noinplace --domainname=${DOMAINNAME} --nodename=${NODENAME}"
 
 if ! [ -d $SDRROOT/dev/nodes/${NODENAME} ]; then
@@ -57,4 +59,3 @@ if ! [ -d $SDRROOT/dev/nodes/${NODENAME} ]; then
 else
 	echo RTL2832U Node already configured
 fi
-

Dockerfiles/files/supervisord-bu353s4.conf

@@ -1,8 +1,8 @@
 [program:nodeBooter]
 autostart=true
 redirect_stderr=true
-command=/bin/bash -lc "nodeBooter -d /nodes/%(ENV_NODENAME)s/DeviceManager.dcd.xml"
-startsecs=5
+command=/bin/bash -lc "wait-for-domain nodeBooter -d /nodes/$NODENAME/DeviceManager.dcd.xml"
+startsecs=35
 priority=10
 
 [eventlistener:nodeBooter_exit]

Dockerfiles/files/supervisord-rtl2832u.conf

@@ -1,8 +1,8 @@
 [program:nodeBooter]
 autostart=true
 redirect_stderr=true
-command=/bin/bash -lc "nodeBooter -d /nodes/%(ENV_NODENAME)s/DeviceManager.dcd.xml"
-startsecs=5
+command=/bin/bash -lc "wait-for-domain nodeBooter -d /nodes/$NODENAME/DeviceManager.dcd.xml"
+startsecs=35
 priority=10
 
 [eventlistener:nodeBooter_exit]

Dockerfiles/files/supervisord-usrp.conf

@@ -1,8 +1,8 @@
 [program:nodeBooter]
 autostart=true
 redirect_stderr=true
-command=/bin/bash -lc "uhd_find_devices && nodeBooter -d /nodes/%(ENV_NODENAME)s/DeviceManager.dcd.xml"
-startsecs=20
+command=/bin/bash -lc "wait-for-domain uhd_find_devices && nodeBooter -d /nodes/$NODENAME/DeviceManager.dcd.xml"
+startsecs=35
 priority=10
 
 [eventlistener:nodeBooter_exit]

Dockerfiles/files/usrp-node-init.sh

@@ -23,6 +23,8 @@ function print_option() {
 	printf " ---> %-20s %-20s\n" $1 $2
 }
 
+export NODENAME=${NODENAME:-MyUsrp_$(hostname)}
+
 USRP_CONFIG_ARGS="--noinplace --domainname=${DOMAINNAME} --nodename=${NODENAME} --usrpname=${USRP_NAME}"
 
 if ! [ -d $SDRROOT/dev/nodes/${NODENAME} ]; then
@@ -46,4 +48,3 @@ if ! [ -d $SDRROOT/dev/nodes/${NODENAME} ]; then
 else
 	echo USRP Node already configured
 fi
-

Dockerfiles/rtl2832u.Dockerfile

@@ -56,12 +56,12 @@ ENV RTL_VENDOR  ""
 ENV RTL_PRODUCT ""
 ENV RTL_SERIAL  ""
 ENV RTL_INDEX   ""
-ENV NODENAME    "" 
+ENV NODENAME    ""
 
 # Add script for configuring the node
 ADD files/rtl2832u-node-init.sh /root/rtl2832u-node-init.sh
 RUN chmod u+x /root/rtl2832u-node-init.sh && \
-	echo "/root/rtl2832u-node-init.sh" | tee -a /root/.bashrc
+	echo "source /root/rtl2832u-node-init.sh" | tee -a /root/.bashrc
 
 # RTL2832U Supervisord script
 ADD files/supervisord-rtl2832u.conf /etc/supervisor.d/rtl2832u.conf

Dockerfiles/usrp.Dockerfile

@@ -109,7 +109,7 @@ ENV USRP_SERIAL     ""
 # Add script for configuring the node
 ADD files/usrp-node-init.sh /root/usrp-node-init.sh
 RUN chmod u+x /root/usrp-node-init.sh && \
-    echo "/root/usrp-node-init.sh" | tee -a /root/.bashrc
+    echo "source /root/usrp-node-init.sh" | tee -a /root/.bashrc
 
 # USRP Supervisord script and exit script
 ADD files/supervisord-usrp.conf /etc/supervisor.d/usrp.conf