Merge branch '2.0.0' of https://github.com/shuffle/shuffle into 2.0.0

.env

@@ -48,8 +48,8 @@ DB_LOCATION=./shuffle-database
 DOCKER_API_VERSION=1.40
 
 # Orborus/Proxy configurations  
-HTTP_PROXY=noproxy
-HTTPS_PROXY=noproxy
+HTTP_PROXY=
+HTTPS_PROXY=
 SHUFFLE_PASS_WORKER_PROXY=TRUE
 SHUFFLE_PASS_APP_PROXY=TRUE
 SHUFFLE_INTERNAL_HTTP_PROXY=noproxy

functions/onprem/orborus/orborus.go

@@ -341,6 +341,7 @@ func deployServiceWorkers(image string) {
 		log.Printf("[ERROR] Memcached is not running. Will try to deploy it.")
 		deployMemcached(dockercli)
 	}
+
 	ip := "shuffle-cache"
 
 	os.Setenv("SHUFFLE_MEMCACHED", fmt.Sprintf("%s:11211", ip))
@@ -3985,8 +3986,9 @@ func deployMemcached(dockercli *dockerclient.Client) error {
 
 	ctx := context.Background()
 
+	memcachedImage := "docker.io/library/memcached:latest"
 	containerConfig := &container.Config{
-		Image: "memcached",
+		Image: memcachedImage,
 		Cmd:   []string{"-m", defaultMem},
 	}
 
@@ -3996,6 +3998,7 @@ func deployMemcached(dockercli *dockerclient.Client) error {
 		},
 	}
 
+	dockercli.ImagePull(ctx, memcachedImage, image.PullOptions{})
 	containerName := "shuffle-cache"
 
 	resp, err := dockercli.ContainerCreate(ctx, containerConfig, hostConfig, nil, nil, containerName)