From 655f57856336aa31174144416d77c232b4a31731 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Wed, 27 Mar 2024 10:07:29 +0000 Subject: [PATCH] Remove the network when there is no service (#103) Reviewed-on: https://gitea.com/gitea/act/pulls/103 Reviewed-by: Jason Song Co-authored-by: Zettat123 Co-committed-by: Zettat123 --- pkg/runner/run_context.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go index b36cd35..f3e3ff7 100644 --- a/pkg/runner/run_context.go +++ b/pkg/runner/run_context.go @@ -382,15 +382,15 @@ func (rc *RunContext) startJobContainer() common.Executor { if err := rc.stopServiceContainers()(ctx); err != nil { logger.Errorf("Error while cleaning services: %v", err) } - if createAndDeleteNetwork { - // clean network if it has been created by act - // if using service containers - // it means that the network to which containers are connecting is created by `act_runner`, - // so, we should remove the network at last. - logger.Infof("Cleaning up network for job %s, and network name is: %s", rc.JobName, networkName) - if err := container.NewDockerNetworkRemoveExecutor(networkName)(ctx); err != nil { - logger.Errorf("Error while cleaning network: %v", err) - } + } + if createAndDeleteNetwork { + // clean network if it has been created by act + // if using service containers + // it means that the network to which containers are connecting is created by `act_runner`, + // so, we should remove the network at last. + logger.Infof("Cleaning up network for job %s, and network name is: %s", rc.JobName, networkName) + if err := container.NewDockerNetworkRemoveExecutor(networkName)(ctx); err != nil { + logger.Errorf("Error while cleaning network: %v", err) } } return nil