From 53644d618dca913e3f979e942c32fe330ea3438b Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Tue, 2 Dec 2014 12:22:51 +0400
Subject: [PATCH] Workaround xz for docker load, pin docker to latest ver

Docker >=1.3.2 runs load operation within a chroot
that does not container xz utility. It is necessary
to extract xz first and then pipe it into docker load.

Pin version of docker to latest stable 1.3.2 version.
Change-Id: I3c7ad72bbe688efcc40e80fca34660b349f3d9b1
Closes-Bug: #1397970
---
 docker/module.mk     | 2 +-
 prepare-build-env.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/module.mk b/docker/module.mk
index 61463186d..3a1e9b179 100644
--- a/docker/module.mk
+++ b/docker/module.mk
@@ -58,7 +58,7 @@ endef
 
 $(BUILD_DIR)/docker/base-images.done: \
 		$(BUILD_DIR)/mirror/docker/build.done
-	find $(LOCAL_MIRROR_DOCKER_BASEURL)/ -regex '.*xz' | xargs -n1 sudo docker load -i
+	for container in $(LOCAL_MIRROR_DOCKER_BASEURL)/*.xz; do xz -dkc -T0 $$container | sudo docker load; done
 	$(ACTION.TOUCH)
 
 $(BUILD_DIR)/docker/busybox.done: \
diff --git a/prepare-build-env.sh b/prepare-build-env.sh
index 126f0e39e..023a66711 100755
--- a/prepare-build-env.sh
+++ b/prepare-build-env.sh
@@ -111,7 +111,7 @@ else
   sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
   # Install docker
   sudo apt-get update
-  sudo apt-get -y install lxc-docker
+  sudo apt-get -y install lxc-docker-1.3.2
 fi
 
 # Install software