X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/16a198bd37502ffeb2c85c53accf05ab88184eca..6ecd3b6f76a1dbb39a56fc81d306969dc0a3f6af:/docker/warehouse/Dockerfile

diff --git a/docker/warehouse/Dockerfile b/docker/warehouse/Dockerfile
index ff55d1a4dd..ff168b56dd 100644
--- a/docker/warehouse/Dockerfile
+++ b/docker/warehouse/Dockerfile
@@ -1,12 +1,5 @@
 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 \
@@ -14,11 +7,15 @@ RUN apt-get update && \
       libgnupg-interface-perl libunix-syslog-perl libbsd-resource-perl \
       bioperl perlmagick imagemagick gnuplot libbz2-dev libfftw3-3 libfftw3-dev \
       xsltproc realpath supervisor libgpgme11-dev libcache-memcached-perl \
-      libio-compress-perl mysql-server mysql-client-5.5 && \
-    perl -MCPAN -e 'install MogileFS::Client;' \
-                -e 'install Crypt::GpgME'
+      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 && \
@@ -26,9 +23,6 @@ RUN \
 
 ADD supervisor.conf /etc/supervisor/conf.d/keepd.conf
 ADD generated/warehouse.conf /etc/warehouse/warehouse-client.conf
-ADD generated/config_mysqld.sh /tmp/config_mysqld.sh
-RUN /bin/sh /tmp/config_mysqld.sh && \
-    /bin/rm /tmp/config_mysqld.sh
 
 # Start the supervisor.
 CMD ["/usr/bin/supervisord", "-n"]