X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/652aec8c581bb6c38bae2c98f0611b142f855e4b..29009a1c1f8a9653042c5853832881aca4141cf2:/docker/compute/Dockerfile

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 8c403b5a50..402ed64b0c 100644
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -3,13 +3,25 @@
 FROM arvados/slurm
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-RUN apt-get update && apt-get -q -y install supervisor
+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 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
+ADD munge.sh /usr/local/bin/munge.sh
 
+VOLUME /var/lib/docker
 # Start the supervisor.
 CMD ["/usr/bin/supervisord", "-n"]