Merge "'Update validate autorelease projects for fluorine"

[releng/builder.git] / packer / provision / gbp.sh

diff --git a/packer/provision/gbp.sh b/packer/provision/gbp.sh
index 706e1525b5616aefc5721fbae1a48bf78459a88f..95ba70c9b076f21d4420f79e88124e2148fccd26 100644 (file)
--- a/packer/provision/gbp.sh
+++ b/packer/provision/gbp.sh
@@ -16,9 +16,9 @@ apt-get update
 apt-get install "linux-image-extra-$(uname -r)" linux-image-extra-virtual
 modprobe aufs
 
-# we need garethr-docker in our puppet manifest to install docker
-# cleanly
-puppet module install garethr-docker --version 5.3.0
+# Install and configure docker. Use puppetlabs docker which supports
+# Ubuntu 16.04
+puppet module install puppetlabs-docker_platform --version 2.2.1
 
 # do the package install via puppet so that we know it actually installs
 # properly and it also makes it quieter but with better error reporting