fixes for building Ubuntu packages with docker, on a Ubuntu host

lib/BuildHelperDebian.py

@@ -42,7 +42,7 @@ def PrepareForBuilding(self):
       return False
     if not self.run("apt-get -y upgrade"):
       return False
-    if not self.run("apt-get -y install build-essential ca-certificates iptables curl apt-transport-https dpkg-sig reprepro wget"):
+    if not self.run("apt-get -y install build-essential ca-certificates iptables curl apt-transport-https dpkg-sig reprepro wget rsync"):
       #apt-utils
       return False
     # make sure we have a fully qualified hostname

lib/DockerContainer.py

@@ -66,9 +66,9 @@ def createmachine(self, distro, release, arch, staticIP):
         self.release = 8
     if self.distro == "ubuntu":
       if self.release == 'trusty':
-        self.release = 14.04
+        self.release = "14.04"
       elif self.release == 'precise':
-        self.release = 12.04
+        self.release = "12.04"
 
     return True
 
@@ -121,7 +121,7 @@ def destroy(self):
   def stop(self):
     #TODO docker stop does not work, not even for test job
     #return self.executeOnHost("docker stop " + self.containername)
-    return self.executeOnHost("systemctl restart docker && sleep 60")
+    return self.executeOnHost("(systemctl restart docker || service docker restart) && sleep 60")
 
   def rsyncContainerPut(self, src, dest):
     dest = dest[:dest.rindex("/")]