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.

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

cicd/common.sh: Support bullseye #443

Merged
merged 1 commit into from
Nov 17, 2023
Merged
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions cicd/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,8 @@ get_llb_peerIP() {
## Deletes a docker host
## arg1 - hostname
delete_docker_host() {
id=`docker ps -f name=$1| grep -w $1 | cut -d " " -f 1 | grep -iv "CONTAINER"`
if [ "$id" != "" ]; then
docker stop $1 2>&1 >> /dev/null
if docker stop $1 2>&1 >> /dev/null
then
hd="true"
ka=`docker ps -f name=ka_$1| grep -w ka_$1 | cut -d " " -f 1 | grep -iv "CONTAINER"`
loxilbs=( "${loxilbs[@]/$1}" )
Expand All @@ -196,9 +195,7 @@ delete_docker_host() {
$hns del $1
sudo rm -fr "$hexist/$1" 2>&1 >> /dev/null
fi
if [ "$id" != "" ]; then
docker rm $1 2>&1 >> /dev/null
fi
docker rm $1 2>&1 >> /dev/null || true
}

## Connects two docker hosts
Expand Down
Loading