5145: while combining colletions, append an integer for any duplicate files.

[arvados.git] / docker / compute / Dockerfile

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index fa6783b11c27a65f4df46358143cf0cecd0f9e42..462115cab0d8b07d7759da951b186e143663acdf 100644 (file)
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -3,20 +3,21 @@
 FROM arvados/slurm
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-RUN apt-get update && apt-get -qqy install supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron dnsmasq
+RUN apt-get update -qq
+RUN apt-get install -qqy supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse crunchstat python-arvados-fuse cron dnsmasq
 
 ADD fuse.conf /etc/fuse.conf
+RUN chmod 644 /etc/fuse.conf
 
 RUN /usr/local/rvm/bin/rvm-exec default gem install arvados-cli arvados
 
 # Install Docker from the Arvados package repository (cf. arvados/base)
-RUN apt-get update -qq && apt-get install -qqy iptables ca-certificates lxc apt-transport-https docker.io
+RUN apt-get install -qqy iptables ca-certificates lxc apt-transport-https docker.io
 
 RUN addgroup --gid 4005 crunch && mkdir /home/crunch && useradd --uid 4005 --gid 4005 crunch && usermod crunch -G fuse,docker && chown crunch:crunch /home/crunch
 
 # Supervisor.
 ADD supervisor.conf /etc/supervisor/conf.d/arvados.conf
-ADD ssh.sh /usr/local/bin/ssh.sh
 ADD generated/setup.sh /usr/local/bin/setup.sh
 ADD wrapdocker /usr/local/bin/wrapdocker.sh