openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Add `--force` to `docker rm` in DevStack plugin"

This commit is contained in:
Zuul 2018-10-20 13:53:13 +00:00 committed by Gerrit Code Review
parent c489cde400 efbb34449c
commit f22bd0b89b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -663,7 +663,7 @@ function extract_hyperkube {
"$tmp_loopback_cni_path"
docker cp "${hyperkube_container}:/usr/bin/nsenter" "$tmp_nsenter_path"
docker rm "$hyperkube_container"
docker rm --force "$hyperkube_container"
sudo install -o "$STACK_USER" -m 0555 -D "$tmp_hyperkube_path" \
"$KURYR_HYPERKUBE_BINARY"
sudo install -o "$STACK_USER" -m 0555 -D "$tmp_loopback_cni_path" \