[ARVADOS] updated: 56e82fff1e2bc9597c06f2d14d43360c02704aa6

[git at public.curoverse.com]

Summary of changes:
 docker/api/Dockerfile            |  1 +
 docker/api/apache2_foreground.sh |  5 -----
 docker/api/ssh.sh                | 10 ++++++++++
 docker/api/supervisor.conf       |  5 +++++
 docker/build_tools/Makefile      |  6 +++---
 5 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100755 docker/api/ssh.sh

       via  56e82fff1e2bc9597c06f2d14d43360c02704aa6 (commit)
       via  171f4d2935ce982b014c94ab358c30a602aa4980 (commit)
      from  60c18cbf3175fb7300af732466c3b0be2c974d16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 56e82fff1e2bc9597c06f2d14d43360c02704aa6
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jul 10 12:20:43 2014 -0400

    Be smarter about building and the --realclean option:
    
    * remove intermediate containers after a successful build
    * --realclean removes only images labelled arvados/*
    * --realclean removes only arvados containers
    
    refs #3219

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 6288310..267e244 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -11,8 +11,8 @@ clean:
 # subsequent makes to build the entire chain from the ground up
 realclean: clean
 	-[ -n "`$(DOCKER) ps -q`" ] && $(DOCKER) stop `$(DOCKER) ps -q`
-	-$(DOCKER) rm `$(DOCKER) ps -a -q`
-	-$(DOCKER) rmi `$(DOCKER) images -q`
+	-$(DOCKER) rm `$(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' '`
+	-$(DOCKER) rmi `$(DOCKER) images -q arvados/*`
 
 # ============================================================
 # Dependencies for */generated files which are prerequisites
@@ -108,7 +108,7 @@ $(SSO_GENERATED): config.yml $(SSO_GENERATED_IN)
 # The docker build -q option suppresses verbose build output.
 # Necessary to prevent failure on building warehouse; see
 # https://github.com/dotcloud/docker/issues/3172
-DOCKER_BUILD = $(DOCKER) build -q
+DOCKER_BUILD = $(DOCKER) build -q --rm=true
 
 # ============================================================
 # The main Arvados servers: api, doc, workbench, warehouse

commit 171f4d2935ce982b014c94ab358c30a602aa4980
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jul 10 11:17:08 2014 -0400

    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 4d10aaa..99a0b4c 100644
--- 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 c3facfe..fc6028e 100755
--- 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
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 a9eed1e..a4f9129 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--