Merge pull request #6471 from ArtfulCoder/prevent_docker_load

Prevent docker load.
This commit is contained in:
Abhi Shah 2015-04-06 11:21:51 -07:00
commit 46370bcc51

View File

@ -69,7 +69,6 @@ cp -v "${KUBE_TEMP}/kubernetes/server/bin/"* /srv/salt-new/salt/kube-bins/
kube_bin_dir="/srv/salt-new/salt/kube-bins"; kube_bin_dir="/srv/salt-new/salt/kube-bins";
docker_images_sls_file="/srv/salt-new/pillar/docker-images.sls"; docker_images_sls_file="/srv/salt-new/pillar/docker-images.sls";
for docker_file in "${KUBE_DOCKER_WRAPPED_BINARIES[@]}"; do for docker_file in "${KUBE_DOCKER_WRAPPED_BINARIES[@]}"; do
docker load -i "${kube_bin_dir}/${docker_file}.tar";
docker_tag=$(cat ${kube_bin_dir}/${docker_file}.docker_tag); docker_tag=$(cat ${kube_bin_dir}/${docker_file}.docker_tag);
sed -i "s/#${docker_file}_docker_tag_value#/${docker_tag}/" "${docker_images_sls_file}"; sed -i "s/#${docker_file}_docker_tag_value#/${docker_tag}/" "${docker_images_sls_file}";
done done