Add supervisor to start keepd when container is launched.

Update README with deploy instructions for Keep.

diff --git a/docker/README b/docker/README
index 806ddd1215fc1dbcef04b1a53a5b61394220c9c5..1530c5f4d9519cfbde92570b44c5992c093ebbd2 100644 (file)
--- a/docker/README
+++ b/docker/README
@@ -52,4 +52,11 @@ DEPLOYING
 2. Provision your Omniauth server with the APP_ID and
    APP_SECRET from api/omniauth.rb.
 
-3. docker run -p 80:80 -p 443:443 arvados/api
+3. Deploying API:
+   docker run -p 80:80 -p 443:443 arvados/api
+
+4. Deploying Keep:
+   mkdir /tmp/keepfs
+   mount -t tmpfs -o size=512M tmpfs /tmp/keepfs
+   docker run -p 25107:25107 -v /tmp/keepfs:/dev/keep-0 arvados/warehouse
+

diff --git a/docker/warehouse/Dockerfile b/docker/warehouse/Dockerfile
index f29f9b6515d1d1f0793e768b080cd8662d5a7b56..a2f0e51d2262b5528f26a83d64bdb389183f9173 100644 (file)
--- a/docker/warehouse/Dockerfile
+++ b/docker/warehouse/Dockerfile
@@ -13,8 +13,15 @@ RUN apt-get update && \
       libtest-pod-perl libtest-pod-coverage-perl libjson-perl flex \
       libgnupg-interface-perl libunix-syslog-perl libbsd-resource-perl \
       bioperl perlmagick imagemagick gnuplot libbz2-dev libfftw3-3 libfftw3-dev \
-      xsltproc realpath
+      xsltproc realpath supervisor
+RUN \
     cd /usr/src/warehouse-apps && \
     sh install.sh /usr/local && \
-    dpkg -i libwarehouse-perl*.deb
+    dpkg -i libwarehouse-perl*.deb && \
+    /bin/mkdir -p /data/keep-0
 
+ADD supervisor.conf /etc/supervisor/conf.d/keepd.conf
+ADD generated/warehouse.conf /etc/warehouse/warehouse-client.conf
+
+# Start the supervisor.
+CMD ["/usr/bin/supervisord", "-n"]

diff --git a/docker/warehouse/supervisor.conf b/docker/warehouse/supervisor.conf
new file mode 100644 (file)
index 0000000..ac6190b
--- /dev/null
+++ b/docker/warehouse/supervisor.conf
@@ -0,0 +1,3 @@
+[program:keepd]
+user=root
+command=/usr/src/warehouse-apps/libwarehouse-perl/server/keepd

diff --git a/docker/warehouse/warehouse.conf.in b/docker/warehouse/warehouse.conf.in
new file mode 100644 (file)
index 0000000..01807fb
--- /dev/null
+++ b/docker/warehouse/warehouse.conf.in
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+$Warehouse::warehouses = [
+    {'name'=>'@@API_HOSTNAME@@',
+     'keep_name'=>'@@API_HOSTNAME@@',
+     'keeps' => [
+      'keep0.@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@:25107',
+      'keep0.@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@:25108',
+     ],
+    },
+];