updated with latest changes in main

Author: Bianco95

pkg/docker/Create.go

@@ -285,16 +285,30 @@ func (h *SidecarHandler) CreateHandler(w http.ResponseWriter, r *http.Request) {
 			dindImage = "docker:dind"
 		}
 
+		// create a dedicated docker network for the dind container
+		shell := exec.ExecTask{
+			Command: "docker",
+			Args:    []string{"network", "create", "--driver", "bridge", string(data.Pod.UID) + "_dind_network"},
+			Shell:   true,
+		}
+		execReturn, err = shell.Execute()
+		if err != nil {
+			HandleErrorAndRemoveData(h, w, "An error occurred during the creation of the network for the DIND container", err, "", "")
+			return
+		}
+
 		dindContainerArgs := []string{"run"}
 		dindContainerArgs = append(dindContainerArgs, gpuArgsAsArray...)
 		if _, err := os.Stat("/cvmfs"); err == nil {
 			dindContainerArgs = append(dindContainerArgs, "-v", "/cvmfs:/cvmfs")
 		}
 
+		// add the network to the dind container
+		dindContainerArgs = append(dindContainerArgs, "--network", string(data.Pod.UID)+"_dind_network")
 		dindContainerArgs = append(dindContainerArgs, "--privileged", "-v", wd+":/"+wd, "-v", "/home:/home", "-v", "/var/lib/docker/overlay2:/var/lib/docker/overlay2", "-v", "/var/lib/docker/image:/var/lib/docker/image", "-d", "--name", string(data.Pod.UID)+"_dind", dindImage)
 
 		var dindContainerID string
-		shell := exec.ExecTask{
+		shell = exec.ExecTask{
 			Command: "docker",
 			Args:    dindContainerArgs,
 			Shell:   true,

pkg/docker/Delete.go

@@ -110,7 +110,21 @@ func (h *SidecarHandler) DeleteHandler(w http.ResponseWriter, r *http.Request) {
 			log.G(h.Ctx).Info("\u2705 [DELETE CALL] Deleted container " + podUID + "_dind")
 		}
 
-		// check if the container has GPU devices attacched using the GpuManager and release them
+		// delete also the network of the docker dind container that is called string(data.Pod.UID) + "_dind_network"
+		cmd = []string{"network", "rm", podUID + "_dind_network"}
+		shell = exec.ExecTask{
+			Command: "docker",
+			Args:    cmd,
+			Shell:   true,
+		}
+		execReturn, _ = shell.Execute()
+		execReturn.Stdout = strings.ReplaceAll(execReturn.Stdout, "\n", "")
+		if execReturn.Stderr != "" {
+			log.G(h.Ctx).Error("\u274C [DELETE CALL] Error deleting network " + podUID + "_dind_network")
+		} else {
+			log.G(h.Ctx).Info("\u2705 [DELETE CALL] Deleted network " + podUID + "_dind_network")
+		}
+
 		wd, err := os.Getwd()
 		if err != nil {
 			HandleErrorAndRemoveData(h, w, "Unable to get current working directory", err, "", "")