openstack
/
fuel-main
Code Issues Proposed changes

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
This commit is contained in:
Matthew Mosesohn 2014-12-02 12:22:51 +04:00
parent b0f2f749ac
commit 53644d618d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/module.mk
View File

@ -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: \

2
prepare-build-env.sh
View File

@ -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