Sanitize how we handle the --ssh option in the api docker container.

refs #3219

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 4d10aaad21654fa45eceee016384c474196c1eb9..99a0b4c527a9363abd645f33b4e0448f51ecff82 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -49,6 +49,7 @@ RUN a2dissite default && \
 
 # Supervisor.
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf
+ADD ssh.sh /usr/local/bin/ssh.sh
 ADD apache2_foreground.sh /etc/apache2/foreground.sh
 
 # Start the supervisor.

diff --git a/docker/api/apache2_foreground.sh b/docker/api/apache2_foreground.sh
index c3facfe6f246578db9825ee46f697e1a583ba291..fc6028ea8391b3445e13adc5de4439fe7207ec2d 100755 (executable)
--- a/docker/api/apache2_foreground.sh
+++ b/docker/api/apache2_foreground.sh
@@ -3,10 +3,5 @@
 read pid cmd state ppid pgrp session tty_nr tpgid rest < /proc/self/stat
 trap "kill -TERM -$pgrp; exit" EXIT TERM KILL SIGKILL SIGTERM SIGQUIT
 
-# Start ssh daemon if requested via the ENABLE_SSH env variable
-if [[ ! "$ENABLE_SSH" =~ (0|false|no|f|^$) ]]; then
-  /etc/init.d/ssh start
-fi
-
 source /etc/apache2/envvars
 /usr/sbin/apache2 -D FOREGROUND

diff --git a/docker/api/ssh.sh b/docker/api/ssh.sh
new file mode 100755 (executable)
index 0000000..664414b
--- /dev/null
+++ b/docker/api/ssh.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo $ENABLE_SSH
+
+# Start ssh daemon if requested via the ENABLE_SSH env variable
+if [[ ! "$ENABLE_SSH" =~ (0|false|no|f|^$) ]]; then
+echo "STARTING"
+  /etc/init.d/ssh start
+fi
+

diff --git a/docker/api/supervisor.conf b/docker/api/supervisor.conf
index a9eed1ed6d6ff01df52bb332ad8e81e52dd1d8ce..a4f91296156590de77cb72a09f4b3c4de043bbd9 100644 (file)
--- a/docker/api/supervisor.conf
+++ b/docker/api/supervisor.conf
@@ -1,3 +1,8 @@
+[program:ssh]
+user=root
+command=/usr/local/bin/ssh.sh
+startsecs=0
+
 [program:postgres]
 user=postgres
 command=/usr/lib/postgresql/9.1/bin/postgres -D /var/lib/postgresql/9.1/main -c config_file=/etc/postgresql/9.1/main/postgresql.conf