Merge sa2ajj/buildbot:hg-docs-fix (PR #1211)

buildbot · Aug 29, 2014 · 8d88db0 · 8d88db0
2 parents d6dc1c0 + e845444
commit 8d88db0
Show file tree

Hide file tree

Showing 2 changed files with 320 additions and 522 deletions.
diff --git a/master/contrib/Dockerfile b/master/contrib/Dockerfile
@@ -62,7 +62,10 @@ from ubuntu:12.04
 #run ln -s /bin/true /sbin/initctl
 
 # Install buildbot and its dependencies
-run echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > \
+
+run /bin/echo -e "\
+    deb http://archive.ubuntu.com/ubuntu precise main universe\n\
+    deb http://archive.ubuntu.com/ubuntu precise-updates main universe" > \
     /etc/apt/sources.list
 run apt-get update
 run DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip python-dev \