docker: remove warehouse container; add new keep container.

refs #3120

diff --git a/docker/arvdock b/docker/arvdock
index 9b9448b74b5231e8e8bb415f6355fbd71f55fc04..f727f1b2c60ac5b6335869558e04aa498de2131b 100755 (executable)
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -218,11 +218,11 @@ function do_start {
        start_container "25107:25107" "keep_server_0" \
            "${keep_volumes[0]}:/dev/keep-0" \
            "api_server:api" \
-           "arvados/warehouse"
+           "arvados/keep"
        start_container "25108:25107" "keep_server_1" \
            "${keep_volumes[1]}:/dev/keep-0" \
            "api_server:api" \
-           "arvados/warehouse"
+           "arvados/keep"
     fi
 
     if [ -d $HOME/.config/arvados ] || mkdir -p $HOME/.config/arvados

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 0a141dfda592a4dd8f7aa3234ba1d3cd874ea43c..36f3654573a0e9761a8012b17384e0919cfb992f 100644 (file)
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -1,4 +1,4 @@
-all: api-image doc-image workbench-image warehouse-image sso-image
+all: api-image doc-image workbench-image keep-image sso-image
 
 # `make clean' removes the files generated in the build directory
 # but does not remove any docker images generated in previous builds
@@ -34,9 +34,7 @@ WORKBENCH_DEPS = workbench/Dockerfile \
                  workbench/passenger.conf \
                  $(WORKBENCH_GENERATED)
 
-WAREHOUSE_DEPS = warehouse/Dockerfile \
-                 warehouse/supervisor.conf \
-                 $(WAREHOUSE_GENERATED)
+KEEP_DEPS = keep/Dockerfile
 
 SSO_DEPS = sso/passenger.conf $(SSO_GENERATED)
 
@@ -66,10 +64,6 @@ WORKBENCH_GENERATED_IN = \
         workbench/apache2_vhost.in \
         workbench/application.yml.in
 
-WAREHOUSE_GENERATED = warehouse/generated/warehouse.conf
-
-WAREHOUSE_GENERATED_IN = warehouse/warehouse.conf.in
-
 SSO_GENERATED = \
         sso/generated/apache2_vhost \
         sso/generated/seeds.rb \
@@ -128,6 +122,10 @@ doc-image: base-image $(BUILD) $(DOC_DEPS)
        $(DOCKER_BUILD) -t arvados/doc doc
        date >doc-image
 
+keep-image: debian-image $(BUILD) $(KEEP_DEPS)
+       $(DOCKER_BUILD) -t arvados/keep keep
+       date >keep-image
+
 jobs-image: base-image $(BUILD) $(JOBS_DEPS)
        $(DOCKER_BUILD) -t arvados/jobs jobs
        date >jobs-image

diff --git a/docker/keep/Dockerfile b/docker/keep/Dockerfile
new file mode 100644 (file)
index 0000000..ca37f10
--- /dev/null
+++ b/docker/keep/Dockerfile
@@ -0,0 +1,14 @@
+# Based on Debian Wheezy
+FROM arvados/debian:wheezy
+MAINTAINER Ward Vandewege <ward@curoverse.com>
+
+RUN echo 'deb http://apt.arvados.org/ wheezy main' > /etc/apt/sources.list.d/apt.arvados.org.list
+
+RUN /usr/bin/apt-key adv --keyserver pgp.mit.edu --recv 1078ECD7
+
+RUN /usr/bin/apt-get update
+
+RUN /usr/bin/apt-get install keep
+
+# Start keep
+CMD ["/usr/bin/keep"]

diff --git a/docker/warehouse/Dockerfile b/docker/warehouse/Dockerfile
deleted file mode 100644 (file)
index ff168b5..0000000
--- a/docker/warehouse/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM arvados/base
-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 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 && \
-    /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
deleted file mode 100644 (file)
index ac6190b..0000000
--- a/docker/warehouse/supervisor.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[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
deleted file mode 100644 (file)
index 8c3c0aa..0000000
--- a/docker/warehouse/warehouse.conf.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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',
-     ],
-     'api_auth_token'=>'@@API_SUPERUSER_SECRET@@',
-    },
-];