From 18432ca138653fc8e00819fe1ad2cce4127da9b6 Mon Sep 17 00:00:00 2001 From: Yann Stepienik Date: Tue, 18 Apr 2023 18:38:17 +0100 Subject: [PATCH] [relase] v0.1.18-unstable2 - restore network clean up --- package.json | 2 +- src/docker/events.go | 7 +------ src/docker/network.go | 7 +++++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 829d00b..dc7140a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.1.18-unstable", + "version": "0.1.18-unstable2", "description": "", "main": "test-server.js", "bugs": { diff --git a/src/docker/events.go b/src/docker/events.go index 9d497b9..35440e7 100644 --- a/src/docker/events.go +++ b/src/docker/events.go @@ -56,12 +56,7 @@ func onDockerCreated(containerID string) { BootstrapContainerFromTags(containerID) } -func onDockerDestroyed(containerID string) { - utils.Debug("onDockerDestroyed: " + containerID) - NetworkCleanUp() -} - func onNetworkDisconnect(networkID string) { utils.Debug("onNetworkDisconnect: " + networkID) - NetworkCleanUp() + NetworkCleanUp(networkID) } \ No newline at end of file diff --git a/src/docker/network.go b/src/docker/network.go index 3987bbe..86af194 100644 --- a/src/docker/network.go +++ b/src/docker/network.go @@ -221,8 +221,11 @@ func ConnectToNetworkSync(networkName string, containerID string) error { return nil } -func NetworkCleanUp() { - return +func NetworkCleanUp(networkId) { + if(networkId == "bridge" || networkId == "host" || networkId == "none") { + return + } + DockerNetworkLock <- true defer func() { <-DockerNetworkLock }()