Added docker socket proxy fix for swarm config in orborus

functions/onprem/orborus/build.sh

@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=1.0.0
+VERSION=1.0.1
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force

functions/onprem/orborus/go.mod

@@ -8,5 +8,5 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/mackerelio/go-osstat v0.2.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.2.27
+	github.com/shuffle/shuffle-shared v0.2.41
 )

functions/onprem/orborus/go.sum

@@ -786,6 +786,8 @@ github.com/shuffle/shuffle-shared v0.2.9 h1:fh2eOD7olifW2uyC3Vlp8u3dqhgIxtYaDVja
 github.com/shuffle/shuffle-shared v0.2.9/go.mod h1:YuMle0RjwXb3hxR5PdaOOD9e+hUyK34OABS0UbrT/Sk=
 github.com/shuffle/shuffle-shared v0.2.27 h1:YT9MtXyMSxIGMpNovjp9pCKFyt2gk40EdAXqDvldhM8=
 github.com/shuffle/shuffle-shared v0.2.27/go.mod h1:YuMle0RjwXb3hxR5PdaOOD9e+hUyK34OABS0UbrT/Sk=
+github.com/shuffle/shuffle-shared v0.2.41 h1:1TBP/47Xzh7ysi6I++wJxRxKpZYp7NBe7YF1DrFL2mA=
+github.com/shuffle/shuffle-shared v0.2.41/go.mod h1:YuMle0RjwXb3hxR5PdaOOD9e+hUyK34OABS0UbrT/Sk=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=

functions/onprem/orborus/orborus.go

@@ -282,6 +282,35 @@ func deployServiceWorkers(image string) {
 			}
 		}
 
+		if len(os.Getenv("DOCKER_HOST")) > 0 {
+			log.Printf("[DEBUG] Deploying docker socket proxy to the network %s as the DOCKER_HOST variable is set", networkName)
+			if err == nil {
+				containers, err := dockercli.ContainerList(ctx, types.ContainerListOptions{
+					All: true,
+				})
+
+				if err == nil {
+					for _, container := range containers {
+						if strings.Contains(strings.ToLower(container.Image), "docker-socket-proxy") {
+							networkConfig := &network.EndpointSettings{}
+							err := dockercli.NetworkConnect(ctx, networkName, container.ID, networkConfig)
+							if err != nil {
+								log.Printf("[ERROR] Failed connecting Docker socket proxy to docker network %s: %s", networkName, err)
+							} else {
+								log.Printf("[INFO] Attached the docker socket proxy to the execution network")
+							}
+
+							break
+						}
+					}
+				} else {
+					log.Printf("[WARNING] Failed listing containers when deploying socket proxy on swarm: %s", err)
+				}
+			} else {
+				log.Printf("[WARNING] Failed listing and finding the right image for docker socket proxy: %s", err)
+			}
+		}
+
 		//serviceOptions := types.ServiceCreateOptions{}
 		//service, err := dockercli.ServiceCreate(
 		//	context.Background(),
@@ -385,13 +414,15 @@ func deployServiceWorkers(image string) {
 			},
 		}
 
-		if defaultNetworkAttach == true {
+		if defaultNetworkAttach == true || strings.ToLower(os.Getenv("SHUFFLE_DEFAULT_NETWORK_ATTACH")) == "true" {
+			targetName := "shuffle_shuffle"
+			log.Printf("[DEBUG] Adding network attach for network %s to worker in swarm", targetName)
 			serviceSpec.Networks = append(serviceSpec.Networks, swarm.NetworkAttachmentConfig{
-				Target: "shuffle_shuffle",
+				Target: targetName,
 			})
 
 			// FIXM: Remove this if deployment fails?
-			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("SHUFFLE_SWARM_OTHER_NETWORK=shuffle_shuffle"))
+			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("SHUFFLE_SWARM_OTHER_NETWORK=%s", targetName))
 		}
 
 		if dockerApiVersion != "" {
@@ -835,6 +866,7 @@ func main() {
 
 	if len(os.Getenv("DOCKER_HOST")) > 0 {
 		log.Printf("[DEBUG] Running docker with socket proxy %s instead of default", os.Getenv("DOCKER_HOST"))
+
 	} else {
 		log.Printf("[DEBUG] Running docker with default socket /var/run/docker.sock")
 	}