5612: Wrap munge with startup script that cleans up /var/run/munge of stale

sockets and pidfiles.  Can now run jobs after stopping and restarting
containers.

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 07acb63445ee0d5654d0a87b96437f8bcd5d045f..591338c2dd5f23e0f01cc9da45bf3c3db4e5f7fa 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -1,7 +1,7 @@
 # Arvados API server Docker container.
 
 FROM arvados/passenger
-MAINTAINER Tim Pierce <twp@curoverse.com>
+MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 # Install postgres and apache.
 RUN apt-get update -qq
@@ -75,6 +75,7 @@ ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf
 ADD generated/setup.sh /usr/local/bin/setup.sh
 ADD generated/setup-gitolite.sh /usr/local/bin/setup-gitolite.sh
 ADD crunch-dispatch-run.sh /usr/local/bin/crunch-dispatch-run.sh
+ADD munge.sh /usr/local/bin/munge.sh
 ADD apache2_foreground.sh /etc/apache2/foreground.sh
 
 # Start the supervisor.

diff --git a/docker/api/munge.sh b/docker/api/munge.sh
new file mode 100755 (executable)
index 0000000..ef10d01
--- /dev/null
+++ b/docker/api/munge.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf /var/run/munge
+exec /etc/init.d/munge start

diff --git a/docker/api/supervisor.conf b/docker/api/supervisor.conf
index b01dc1c11051a723e35f8f56dfc8ce8c0a58d7f3..c5dd1e9b2f9df9c2bd6d9b989b2f9e8c8958c28b 100644 (file)
--- a/docker/api/supervisor.conf
+++ b/docker/api/supervisor.conf
@@ -15,7 +15,7 @@ autorestart=true
 
 [program:munge]
 user=root
-command=/etc/init.d/munge start
+command=/usr/local/bin/munge.sh
 startsecs=0
 
 [program:slurm]

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index c4b744ba5cb509195df061f9891b7934ba3b6d2e..eac212c908a9ca8fc964a89b2624fded7bb84d8d 100644 (file)
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -2,7 +2,7 @@
 
 # Based on Debian Wheezy
 FROM arvados/debian:wheezy
-MAINTAINER Tim Pierce <twp@curoverse.com>
+MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 462115cab0d8b07d7759da951b186e143663acdf..402ed64b0cf885826865a287089e356efe6b5049 100644 (file)
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -20,6 +20,7 @@ RUN addgroup --gid 4005 crunch && mkdir /home/crunch && useradd --uid 4005 --gid
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf
 ADD generated/setup.sh /usr/local/bin/setup.sh
 ADD wrapdocker /usr/local/bin/wrapdocker.sh
+ADD munge.sh /usr/local/bin/munge.sh
 
 VOLUME /var/lib/docker
 # Start the supervisor.

diff --git a/docker/compute/munge.sh b/docker/compute/munge.sh
new file mode 100755 (executable)
index 0000000..ef10d01
--- /dev/null
+++ b/docker/compute/munge.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf /var/run/munge
+exec /etc/init.d/munge start

diff --git a/docker/compute/supervisor.conf b/docker/compute/supervisor.conf
index 615e55a953606e948f7628d68b6ab8e37bebd390..b3c715b5a9d08a9c8133f61029aa2b26d08e7852 100644 (file)
--- a/docker/compute/supervisor.conf
+++ b/docker/compute/supervisor.conf
@@ -1,6 +1,6 @@
 [program:munge]
 user=root
-command=/etc/init.d/munge start
+command=/usr/local/bin/munge.sh
 startsecs=0
 
 [program:slurm]
@@ -26,4 +26,3 @@ command=/usr/local/bin/wrapdocker.sh
 user=root
 command=/etc/init.d/dnsmasq start
 startsecs=0
-

diff --git a/docker/postgresql/Dockerfile b/docker/postgresql/Dockerfile
index b6fed4e8c5a9a0c2bce7cac0c47ec28930fea923..8a59acfbd0cd95e81d8e20fde30082e15bae59ae 100644 (file)
--- a/docker/postgresql/Dockerfile
+++ b/docker/postgresql/Dockerfile
@@ -1,7 +1,7 @@
 # PostgreSQL Docker container for Arvados.
 
 FROM arvados/debian:wheezy
-MAINTAINER Tim Pierce <twp@curoverse.com>
+MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 # TODO(twp): parameterize variables via autoconf or similar.
 ENV POSTGRES_ROOT_PW   dummy_pw