Added compatibility of docker-socket-proxy example in docker-compose to bypass docker access problems and add ACLs

functions/onprem/orborus/build.sh

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

functions/onprem/orborus/orborus.go

@@ -361,13 +361,6 @@ func deployServiceWorkers(image string) {
 						fmt.Sprintf("SHUFFLE_APP_REPLICAS=%d", cnt),
 						fmt.Sprintf("TZ=%s", timezone),
 					},
-					Mounts: []mount.Mount{
-						mount.Mount{
-							Source: "/var/run/docker.sock",
-							Target: "/var/run/docker.sock",
-							Type:   mount.TypeBind,
-						},
-					},
 					Hosts: []string{
 						innerContainerName,
 					},
@@ -398,6 +391,18 @@ func deployServiceWorkers(image string) {
 			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("SHUFFLE_SCALE_REPLICAS=%s", os.Getenv("SHUFFLE_SCALE_REPLICAS")))
 		}
 
+		if len(os.Getenv("DOCKER_HOST")) > 0 {
+			serviceSpec.TaskTemplate.ContainerSpec.Env = append(serviceSpec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("DOCKER_HOST=%s", os.Getenv("DOCKER_HOST")))
+		} else {
+			serviceSpec.TaskTemplate.ContainerSpec.Mounts = []mount.Mount{
+				mount.Mount{
+					Source: "/var/run/docker.sock",
+					Target: "/var/run/docker.sock",
+					Type:   mount.TypeBind,
+				},
+			}
+		}
+
 		serviceOptions := types.ServiceCreateOptions{}
 		_, err = dockercli.ServiceCreate(
 			ctx,
@@ -805,6 +810,12 @@ 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")
+	}
+
 	ctx := context.Background()
 	// Run by default from now
 	zombiecheck(ctx, workerTimeout)