Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent docker load. #6471

Merged
merged 1 commit into from
Apr 6, 2015
+0 −1
Merged

Prevent docker load. #6471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prevent docker load.
  • Loading branch information
@ArtfulCoder
ArtfulCoder committed Apr 6, 2015
commit 9231fae99890f5f5904950043b5e6d6148d2d253
1 change: 0 additions & 1 deletion cluster/saltbase/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
docker_images_sls_file="/srv/salt-new/pillar/docker-images.sls";
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);
sed -i "s/#${docker_file}_docker_tag_value#/${docker_tag}/" "${docker_images_sls_file}";
done
Expand Down