Merge branch 'dev'

DerekRoberts · DerekRoberts · commit 0238f8f290bc · 2016-01-14T00:23:11.000-08:00
diff --git a/Dockerfile b/Dockerfile
@@ -41,7 +41,7 @@ RUN groupadd -r mongodb; \
 
 # Packages
 #
-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 42F3E95A2C4F08279C4960ADD68FA50FEA312927; \
+RUN apt-key adv --keyserver hkp://pgp.mit.edu --recv-keys 42F3E95A2C4F08279C4960ADD68FA50FEA312927; \
     echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/$MONGO_MAJOR multiverse" > /etc/apt/sources.list.d/mongodb-org.list
 RUN apt-get update; \
     apt-get install -y \

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ RUN groupadd -r mongodb; \`
`41`	`41`
`42`	`42`	`# Packages`
`43`	`43`	`#`
`44`		`-RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 42F3E95A2C4F08279C4960ADD68FA50FEA312927; \`
	`44`	`+RUN apt-key adv --keyserver hkp://pgp.mit.edu --recv-keys 42F3E95A2C4F08279C4960ADD68FA50FEA312927; \`
`45`	`45`	`echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/$MONGO_MAJOR multiverse" > /etc/apt/sources.list.d/mongodb-org.list`
`46`	`46`	`RUN apt-get update; \`
`47`	`47`	`apt-get install -y \`