Fix up tag and "add tag" button display.

[arvados.git] / docker / warehouse / Dockerfile

diff --git a/docker/warehouse/Dockerfile b/docker/warehouse/Dockerfile
index f29f9b6515d1d1f0793e768b080cd8662d5a7b56..ff168b56dd8052a3149f38bcbbe20bbfdb98c945 100644 (file)
--- a/docker/warehouse/Dockerfile
+++ b/docker/warehouse/Dockerfile
@@ -1,20 +1,28 @@
 FROM arvados/base
-MAINTAINER Tim Pierce <twp@clinicalfuture.com>
-
-# Install Warehouse.
-
-ADD generated/warehouse.tar.gz /usr/src/
-
-# Temporary: remove non-running test
-RUN /bin/rm /usr/src/warehouse-apps/libwarehouse-perl/t/pod-coverage.t
+MAINTAINER Tim Pierce <twp@curoverse.com>
 
 RUN apt-get update && \
     apt-get -q -y install dpkg-dev debhelper libdbi-perl libwww-perl \
       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 libgpgme11-dev libcache-memcached-perl \
+      libio-compress-perl
+
+# Install warehouse-apps source and build.
+# Remove failing test t/pod-coverage.t.
+RUN \
+    perl -MCPAN -e 'install MogileFS::Client;' \
+                -e 'install Crypt::GpgME' && \
+    git clone https://github.com/curoverse/warehouse-apps.git /usr/src/warehouse-apps && \
+    rm /usr/src/warehouse-apps/libwarehouse-perl/t/pod-coverage.t && \
     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"]