This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 33973cdd BIGTOP-3828: Docker network resource continues to remain when
use docker provisioner (#1026)
33973cdd is described below
commit 33973cddec1ac9f51c57a87c6b511c2dd0aa7d63
Author: Shuhei Yamasaki <[email protected]>
AuthorDate: Wed Sep 28 09:32:52 2022 +0900
BIGTOP-3828: Docker network resource continues to remain when use docker
provisioner (#1026)
---
provisioner/docker/docker-hadoop.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/provisioner/docker/docker-hadoop.sh
b/provisioner/docker/docker-hadoop.sh
index 64d04da6..66aa4818 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -211,10 +211,16 @@ destroy() {
else
get_nodes
docker exec ${NODES[0]} bash -c "umount /etc/hosts; rm -f /etc/hosts"
+ NETWORK_ID=`docker network ls --quiet --filter
name=${PROVISION_ID}_default`
+
if [ -n "$PROVISION_ID" ]; then
$DOCKER_COMPOSE_CMD -p $PROVISION_ID stop
$DOCKER_COMPOSE_CMD -p $PROVISION_ID rm -f
fi
+
+ if [ -n "$NETWORK_ID" ]; then
+ docker network rm ${PROVISION_ID}_default
+ fi
rm -rvf ./config .provision_id .error_msg*
fi
}