Merge branch 'master' into 5493-getting-started-modal

[arvados.git] / docker / compute / Dockerfile

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 4cc02aa8243b436a8f53729b216e52eab1bd3e0c..402ed64b0cf885826865a287089e356efe6b5049 100644 (file)
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -3,31 +3,24 @@
 FROM arvados/slurm
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 
-ADD apt.arvados.org.list /etc/apt/sources.list.d/
-RUN apt-key adv --keyserver pgp.mit.edu --recv 1078ECD7
-
-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-python-client python-arvados-fuse cron
+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 Docker Inc. repository
-RUN apt-get update -qq && apt-get install -qqy iptables ca-certificates lxc apt-transport-https
-RUN echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-RUN apt-get update -qq && apt-get install -qqy lxc-docker
+# 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
 
-# Fix /dev/fuse permissions/ownership
-RUN chmod 1660 /dev/fuse && chgrp fuse /dev/fuse
-
 # 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.