Fix some build failures

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

circle.yml

@@ -37,7 +37,6 @@ jobs:
             docker build -f $dockerfile --tag cli-builder:$CIRCLE_BUILD_NUM .
             name=cross-$CIRCLE_BUILD_NUM-$CIRCLE_NODE_INDEX
             docker run \
-                -e VERSION=$VERSION \
                 -e CROSS_GROUP=$CIRCLE_NODE_INDEX \
                 --name $name cli-builder:$CIRCLE_BUILD_NUM \
                 make cross

dockerfiles/Dockerfile.dev

@@ -1,7 +1,7 @@
 
 FROM    golang:1.9.2-alpine3.6
 
-RUN     apk add -U git make bash coreutils ca-certificates openssh
+RUN     apk add -U git make bash coreutils ca-certificates
 
 ARG     VNDR_SHA=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
 RUN     go get -d github.com/LK4D4/vndr && \

e2e/compose-env.yaml

@@ -8,6 +8,8 @@ services:
       image: 'docker:${TEST_ENGINE_VERSION:-edge-dind}'
       privileged: true
       command: ['--insecure-registry=registry:5000']
+      depends_on:
+          - registry
 
   notary-server:
       image: 'notary:server-0.4.2'

e2e/stack/remove_test.go

@@ -2,6 +2,7 @@ package stack
 
 import (
 	"fmt"
+	"os"
 	"strings"
 	"testing"
 
@@ -20,7 +21,9 @@ func TestRemove(t *testing.T) {
 	deployFullStack(t, stackname)
 	defer cleanupFullStack(t, stackname)
 
-	result := icmd.RunCmd(shell(t, "docker stack rm %s", stackname))
+	result := icmd.RunCmd(shell(t, "docker version"))
+	fmt.Println(result.Stdout(), os.Getenv("DOCKER_HOST"), os.Getenv("TEST_DOCKER_HOST"))
+	result = icmd.RunCmd(shell(t, "docker stack rm %s", stackname))
 
 	result.Assert(t, icmd.Expected{Err: icmd.None})
 	golden.Assert(t, result.Stdout(), "stack-remove-success.golden")