Merge shanzi/buildbot:update-dockerfile (PR #1577)

buildbot · Mar 8, 2015 · cb9b4c0 · cb9b4c0
2 parents 05653d1 + 006e6e2
commit cb9b4c0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/master/contrib/Dockerfile b/master/contrib/Dockerfile
@@ -54,7 +54,7 @@
 # ssh -p $(docker port $CONTAINER_ID 22 | cut -d: -f 2) admin@localhost
 #
 # Base docker image
-from ubuntu:12.04
+from ubuntu:14.04
 
 # Make dpkg happy with the upstart issue
 ## appears to not be necessary anymore --dustin
@@ -64,13 +64,13 @@ from ubuntu:12.04
 # Install buildbot and its dependencies
 
 run /bin/echo -e "\
-    deb http://archive.ubuntu.com/ubuntu precise main universe\n\
-    deb http://archive.ubuntu.com/ubuntu precise-updates main universe" > \
+    deb http://archive.ubuntu.com/ubuntu trusty main universe\n\
+    deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" > \
     /etc/apt/sources.list
 run apt-get update
 run DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip python-dev \
     supervisor git sudo ssh
-run pip install sqlalchemy==0.7.9 buildbot buildbot_slave
+run pip install buildbot buildbot_slave
 
 # Set ssh superuser (username: admin   password: admin)
 run mkdir /data /var/run/sshd