Merge branch 'master' into 6465-optimize-workbench-integration-tests

[arvados.git] / docker / api / Dockerfile

diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index 5ba90c570c7b814e69c0574628bf6ffc45edb610..758c015aa344d7147a6cda0baf7b51ca46ecd956 100644 (file)
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -4,8 +4,8 @@ FROM arvados/passenger
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 # Install postgres and apache.
-RUN apt-get update -qq
-RUN apt-get install -qqy \
+RUN apt-get update -q
+RUN apt-get install -qy \
     procps postgresql postgresql-server-dev-9.1 slurm-llnl munge \
     supervisor sudo libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \
     libjson-perl cron openssh-server
@@ -53,13 +53,14 @@ RUN mkdir -p /var/lib/arvados
 RUN addgroup --gid 4005 crunch && mkdir /home/crunch && useradd --uid 4005 --gid 4005 crunch && chown crunch:crunch /home/crunch
 
 # Create keep and compute node objects
-ADD keep_server_0.json /root/
-ADD keep_server_1.json /root/
+ADD generated/keep_server_0.json /root/
+ADD generated/keep_server_1.json /root/
 ADD keep_proxy.json /root/
 
 # Set up update-gitolite.rb
 RUN mkdir /usr/local/arvados/config -p
 ADD generated/arvados-clients.yml /usr/local/arvados/config/
+ADD .gitolite.rc /usr/local/arvados/config/
 ADD update-gitolite.rb /usr/local/arvados/
 
 # Supervisor.