Update dependencies + support for compiling on Windows

.gitignore

@@ -1,5 +1,5 @@
 /cflocal
-/cflocal-*
+/out
 .droplet
 .DS_Store
 .idea

.gitmodules

@@ -21,40 +21,31 @@
 	url = https://gopkg.in/yaml.v2
 [submodule "vendor/github.com/docker/docker"]
 	path = vendor/github.com/docker/docker
-	url = https://github.com/docker/docker
-[submodule "vendor/github.com/Sirupsen/logrus"]
-	path = vendor/github.com/Sirupsen/logrus
-	url = https://github.com/Sirupsen/logrus
+	url = https://github.com/sclevine/docker
 [submodule "vendor/github.com/docker/go-connections"]
 	path = vendor/github.com/docker/go-connections
 	url = https://github.com/docker/go-connections
-[submodule "vendor/github.com/docker/go-units"]
-	path = vendor/github.com/docker/go-units
-	url = https://github.com/docker/go-units
-[submodule "vendor/github.com/opencontainers/runc"]
-	path = vendor/github.com/opencontainers/runc
-	url = https://github.com/opencontainers/runc
-[submodule "vendor/github.com/pkg/errors"]
-	path = vendor/github.com/pkg/errors
-	url = https://github.com/pkg/errors
 [submodule "vendor/golang.org/x/net"]
 	path = vendor/golang.org/x/net
 	url = https://github.com/golang/net
-[submodule "vendor/github.com/docker/distribution"]
-	path = vendor/github.com/docker/distribution
-	url = https://github.com/docker/distribution
 [submodule "vendor/github.com/nu7hatch/gouuid"]
 	path = vendor/github.com/nu7hatch/gouuid
 	url = https://github.com/nu7hatch/gouuid
 [submodule "vendor/github.com/fatih/color"]
 	path = vendor/github.com/fatih/color
 	url = https://github.com/fatih/color
-[submodule "vendor/github.com/mattn/go-colorable"]
-	path = vendor/github.com/mattn/go-colorable
-	url = https://github.com/mattn/go-colorable
-[submodule "vendor/github.com/mattn/go-isatty"]
-	path = vendor/github.com/mattn/go-isatty
-	url = https://github.com/mattn/go-isatty
 [submodule "vendor/golang.org/x/crypto"]
 	path = vendor/golang.org/x/crypto
 	url = https://github.com/golang/crypto
+[submodule "vendor/github.com/Sirupsen/logrus"]
+	path = vendor/github.com/Sirupsen/logrus
+	url = https://github.com/Sirupsen/logrus
+[submodule "vendor/github.com/opencontainers/runc"]
+	path = vendor/github.com/opencontainers/runc
+	url = https://github.com/docker/runc
+[submodule "vendor/github.com/Microsoft/go-winio"]
+	path = vendor/github.com/Microsoft/go-winio
+	url = https://github.com/Microsoft/go-winio
+[submodule "vendor/golang.org/x/sys"]
+	path = vendor/golang.org/x/sys
+	url = http://github.com/golang/sys

VERSION

@@ -0,0 +1 @@
+0.2.2

bin/build

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname "${BASH_SOURCE[0]}")/..
+
+mkdir -p out
+
+os_list=(darwin linux windows)
+out_list=(macos linux windows.exe)
+version=${1:-$(<VERSION)}
+
+for ((i=0; i < ${#os_list[@]}; i++)); do
+  echo "Building plugin for ${os_list[i]}..."
+  GOOS=${os_list[i]} go build -ldflags "-X main.Version=$version" -o "out/cflocal-$version-${out_list[i]}" .
+done

cf/cmd/cmd.go

@@ -35,7 +35,7 @@ type Stager interface {
 
 //go:generate mockgen -package mocks -destination mocks/runner.go github.com/sclevine/cflocal/cf/cmd Runner
 type Runner interface {
-	Run(config *local.RunConfig, color local.Colorizer) (status int, err error)
+	Run(config *local.RunConfig, color local.Colorizer) (status int64, err error)
 	Export(config *local.ExportConfig, reference string) (imageID string, err error)
 }
 

cf/cmd/mocks/runner.go

@@ -40,9 +40,9 @@ func (_mr *_MockRunnerRecorder) Export(arg0, arg1 interface{}) *gomock.Call {
 	return _mr.mock.ctrl.RecordCall(_mr.mock, "Export", arg0, arg1)
 }
 
-func (_m *MockRunner) Run(_param0 *local.RunConfig, _param1 local.Colorizer) (int, error) {
+func (_m *MockRunner) Run(_param0 *local.RunConfig, _param1 local.Colorizer) (int64, error) {
 	ret := _m.ctrl.Call(_m, "Run", _param0, _param1)
-	ret0, _ := ret[0].(int)
+	ret0, _ := ret[0].(int64)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }

cf/cmd/run_test.go

@@ -106,7 +106,7 @@ var _ = Describe("Run", func() {
 						Services: forwardedServices,
 					},
 				}, gomock.Any()).Return(
-					0, nil,
+					int64(0), nil,
 				).Do(func(_ *local.RunConfig, c local.Colorizer) {
 					Expect(c("some-text")).To(Equal(color.GreenString("some-text")))
 				}),

local/runner.go

@@ -73,7 +73,7 @@ type RunConfig struct {
 	AppConfig   *AppConfig
 }
 
-func (r *Runner) Run(config *RunConfig, color Colorizer) (status int, err error) {
+func (r *Runner) Run(config *RunConfig, color Colorizer) (status int64, err error) {
 	if err := r.pull(); err != nil {
 		return 0, err
 	}
@@ -188,7 +188,7 @@ func (r *Runner) Export(config *ExportConfig, reference string) (imageID string,
 }
 
 func (r *Runner) pull() error {
-	body, err := r.Docker.ImagePull(context.Background(), "cloudfoundry/cflinuxfs2:" + r.StackVersion, types.ImagePullOptions{})
+	body, err := r.Docker.ImagePull(context.Background(), "cloudfoundry/cflinuxfs2:"+r.StackVersion, types.ImagePullOptions{})
 	if err != nil {
 		return err
 	}
@@ -278,7 +278,7 @@ func (r *Runner) buildContainerConfig(config *AppConfig, forwardConfig *service.
 	return &container.Config{
 		Hostname:     "cflocal",
 		User:         "vcap",
-		ExposedPorts: map[nat.Port]struct{}{"8080/tcp": {}},
+		ExposedPorts: nat.PortSet(map[nat.Port]struct{}{"8080/tcp": {}}),
 		Env:          mapToEnv(mergeMaps(env, config.RunningEnv, config.Env)),
 		Image:        "cloudfoundry/cflinuxfs2:" + r.StackVersion,
 		WorkingDir:   "/home/vcap/app",

local/runner_test.go

@@ -128,7 +128,7 @@ var _ = Describe("Runner", func() {
 			}
 			status, err := runner.Run(config, percentColor)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(status).To(Equal(137))
+			Expect(status).To(Equal(int64(137)))
 
 			Expect(logs.Contents()).To(MatchRegexp(`\[some-app\] % \S+ Forwarding: some-name some-other-name`))
 			Expect(logs.Contents()).To(MatchRegexp(