Merge branch 'master' into 3261-keep-docker-config

[arvados.git] / docker / compute / Dockerfile

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 4cc02aa8243b436a8f53729b216e52eab1bd3e0c..929c136c927216863b4f7178719bfa91670c7c52 100644 (file)
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -3,10 +3,7 @@
 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 && 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
 
 ADD fuse.conf /etc/fuse.conf
 
@@ -20,9 +17,6 @@ RUN apt-get update -qq && apt-get install -qqy lxc-docker
 
 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