From 7918a39c39f1f42796efa9a27a521745dbb34d25 Mon Sep 17 00:00:00 2001 From: Gonzalo Peci Date: Wed, 6 Jul 2016 10:43:49 +0200 Subject: [PATCH 1/4] Update documentation and makefiles for release --- CHANGELOG.md | 3 +++ Makefile | 1 - README.md | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11e90ae..bc536c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## 1.0.10 +IMPROVEMENTS: + * Mount on both /c/Users and /Users for compatibility + * Update documentation ## 1.0.0 diff --git a/Makefile b/Makefile index 65b6657..742994b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ default: test build test: clean go get -d -v -t ./... - go get golang.org/x/tools/cmd/vet go test -v ./... go vet ./... diff --git a/README.md b/README.md index 7d5d1e0..b0a64e1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ As the title says this is still WIP and im working to add functionality listed o ## Requirements * Windows 7+ (for now) * [Docker Machine](https://docs.docker.com/machine/) 0.5.0+ -* [VMware Workstation](https://www.vmware.com/products/workstation) +* [VMware Workstation](https://www.vmware.com/products/workstation) Workstation Free/Pro 10 + ## Installation @@ -74,14 +74,14 @@ Environment variables and default values: | `--vmwareworkstation-cpu-count` | `WORKSTATION_CPU_COUNT` | `1` | | `--vmwareworkstation-disk-size` | `WORKSTATION_DISK_SIZE` | `20000` | | `--vmwareworkstation-memory-size` | `WORKSTATION_MEMORY_SIZE` | `1024` | -| `--vmwareworkstation-ssh-user` | `WORKSTATION_SSH_USER` | `B2DUser` | -| `--vmwareworkstation-ssh-password` | `WORKSTATION_SSH_PASSWORD` | `B2DPass` | +| `--vmwareworkstation-ssh-user` | `WORKSTATION_SSH_USER` | `docker` | +| `--vmwareworkstation-ssh-password` | `WORKSTATION_SSH_PASSWORD` | `tcuser` | ## Development ### Build from Source If you wish to work on VMWare Workstation Driver for Docker machine, you'll first need -* [Go](http://www.golang.org) installed (version 1.5+ is required). +* [Go](http://www.golang.org) installed (version 1.6+ is required). * Make sure Go is properly installed, including setting up a [GOPATH](http://golang.org/doc/code.html#GOPATH). * [MSYS](https://msys2.github.io/) * **Make** We well need to use pacman to install make From 5d4a6520ca7f67481f0705788a8b9c104a1fd941 Mon Sep 17 00:00:00 2001 From: Gonzalo Peci Date: Wed, 6 Jul 2016 11:29:50 +0200 Subject: [PATCH 2/4] User glide to lock dependancies --- .gitignore | 3 +++ Makefile | 11 +++++++---- appveyor.yml | 5 +++-- glide.lock | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ glide.yaml | 14 ++++++++++++++ 5 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 glide.lock create mode 100644 glide.yaml diff --git a/.gitignore b/.gitignore index 96f5536..83d8584 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Glide +./vendor + # Compiled Object files, Static and Dynamic libs (Shared Objects) *.o *.a diff --git a/Makefile b/Makefile index 742994b..070100f 100644 --- a/Makefile +++ b/Makefile @@ -2,16 +2,19 @@ default: test build -test: clean - go get -d -v -t ./... +deps: + go get github.com/Masterminds/glide + glide install + +test: deps go test -v ./... go vet ./... -build: clean - go get -d -v -t ./... +build: deps go build -i -o ./bin/docker-machine-driver-vmwareworkstation.exe ./cmd/ clean: + $(RM) -rf vendor $(RM) bin/* .PHONY: clean test build \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 6844449..0690d9a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,13 +29,14 @@ init: # Build install: - - set Path=c:\go\bin;%Path% + - set Path=c:\go\bin;%GOPATH%/bin;%Path% - echo %Path% - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-%GOARCH%.msi - msiexec /i go%GOVERSION%.windows-%GOARCH%.msi /q - go version - go env - - go get -d -v -t ./... + - go get github.com/Masterminds/glide + - glide install build_script: - go test -v ./... diff --git a/glide.lock b/glide.lock new file mode 100644 index 0000000..e3c94a6 --- /dev/null +++ b/glide.lock @@ -0,0 +1,48 @@ +hash: 0eab0bf30d2ef80ce6f6c02e2071f7477a7ab5e30a22572bf930a68feb47b6ae +updated: 2016-07-06T11:26:53.4572057+02:00 +imports: +- name: github.com/docker/docker + version: a8a31eff10544860d2188dddabdee4d727545796 + subpackages: + - pkg/term +- name: github.com/docker/machine + version: a650a404fc3e006fea17b12615266168db79c776 + subpackages: + - libmachine/drivers + - libmachine/log + - libmachine/mcnflag + - libmachine/mcnutils + - libmachine/ssh + - libmachine/state + - libmachine/drivers/plugin + - version + - libmachine/drivers/plugin/localbinary + - libmachine/drivers/rpc + - libmachine/version +- name: github.com/gorilla/mux + version: 9fa818a44c2bf1396a17f9d5a3c0f6dd39d2ff8e +- name: github.com/Sirupsen/logrus + version: f3cfb454f4c209e6668c95216c4744b8fddb2356 +- name: golang.org/x/crypto + version: beef0f4390813b96e8e68fd78570396d0f4751fc + subpackages: + - ssh + - ssh/terminal + - curve25519 +- name: google.golang.org/grpc + version: a0ff1e78a98cd140c2d18a0210ab0a2a183a2b4c + subpackages: + - credentials/oauth +testImports: +- name: github.com/davecgh/go-spew + version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d + subpackages: + - spew +- name: github.com/pmezard/go-difflib + version: 792786c7400a136282c1664665ae0a8db921c6c2 + subpackages: + - difflib +- name: github.com/stretchr/testify + version: f390dcf405f7b83c997eac1b06768bb9f44dec18 + subpackages: + - assert diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 0000000..ab0166d --- /dev/null +++ b/glide.yaml @@ -0,0 +1,14 @@ +package: github.com/pecigonzalo/docker-machine-vmwareworkstation +import: +- package: github.com/docker/machine + version: v0.7.0 +- package: golang.org/x/crypto +- package: github.com/Sirupsen/logrus +- package: google.golang.org/grpc + subpackages: + - credentials/oauth +testImport: +- package: github.com/stretchr/testify + version: v1.1.3 + subpackages: + - assert From 446062888452de5b2d9abe23bec9908107538deb Mon Sep 17 00:00:00 2001 From: Gonzalo Peci Date: Wed, 6 Jul 2016 11:39:37 +0200 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc536c1..60f2544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 1.0.10 IMPROVEMENTS: * Mount on both /c/Users and /Users for compatibility + * Use glide for dependancy vendoring * Update documentation ## 1.0.0 From fee102a08844df8c978c1a319f425e00aa07143a Mon Sep 17 00:00:00 2001 From: Gonzalo Peci Date: Wed, 6 Jul 2016 12:01:18 +0200 Subject: [PATCH 4/4] Reshufle appveyor and fix gitingore --- .gitignore | 4 ++-- Makefile | 14 +++++++------- appveyor.yml | 23 +++++++++++------------ glide.lock | 14 +++----------- glide.yaml | 12 +++++++++--- 5 files changed, 32 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 83d8584..1dff757 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Glide -./vendor +vendor/ # Compiled Object files, Static and Dynamic libs (Shared Objects) *.o @@ -26,4 +26,4 @@ _testmain.go *.test *.prof -./bin \ No newline at end of file +bin/ \ No newline at end of file diff --git a/Makefile b/Makefile index 070100f..8e33942 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,20 @@ #export GO15VENDOREXPERIMENT = 1 -default: test build +default: deps test build -deps: +deps: clean go get github.com/Masterminds/glide glide install -test: deps - go test -v ./... - go vet ./... +test: + go test -v $(glide novendor) + go vet $(glide novendor) -build: deps +build: go build -i -o ./bin/docker-machine-driver-vmwareworkstation.exe ./cmd/ clean: $(RM) -rf vendor $(RM) bin/* -.PHONY: clean test build \ No newline at end of file +.PHONY: clean deps test build \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 0690d9a..3494589 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,10 @@ clone_depth: 5 os: Windows Server 2012 R2 environment: + MSYSTEM: MINGW64 + Msys: winsymlink:nativestrict GOPATH: c:\gopath + Path: c:\go\bin;c:\gopath\bin;C:\msys64\usr\local\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH% matrix: - GOARCH: 386 GOVERSION: 1.6 @@ -24,31 +27,27 @@ environment: GOVERSION: 1.6 init: - - git config --global core.autocrlf input + - ps: git config --global core.autocrlf input + - pacman -Sy + - pacman -S --noconfirm make wget curl bzr git mercurial subversion # Build - install: - - set Path=c:\go\bin;%GOPATH%/bin;%Path% - - echo %Path% - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-%GOARCH%.msi - msiexec /i go%GOVERSION%.windows-%GOARCH%.msi /q - - go version - - go env - - go get github.com/Masterminds/glide - - glide install + - ps: echo $env:Path + - make deps build_script: - - go test -v ./... - - go vet ./... - git rev-parse HEAD - - go build -i -o ./bin/docker-machine-driver-vmwareworkstation_windows-%GOARCH%.exe ./cmd/ + - make test + - make build test: off # Deploy artifacts: - - path: /bin/docker-machine-driver-vmwareworkstation_*-*.exe + - path: //bin/docker-machine-driver-vmwareworkstation.exe deploy: provider: GitHub diff --git a/glide.lock b/glide.lock index e3c94a6..26f3645 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 0eab0bf30d2ef80ce6f6c02e2071f7477a7ab5e30a22572bf930a68feb47b6ae -updated: 2016-07-06T11:26:53.4572057+02:00 +hash: 75294a28793879eedd26ccceee2979bef691bf02eb7c99c4ab34d214db8cfe96 +updated: 2016-07-06T13:07:31.3243298+02:00 imports: - name: github.com/docker/docker version: a8a31eff10544860d2188dddabdee4d727545796 @@ -9,30 +9,22 @@ imports: version: a650a404fc3e006fea17b12615266168db79c776 subpackages: - libmachine/drivers + - libmachine/drivers/plugin - libmachine/log - libmachine/mcnflag - libmachine/mcnutils - libmachine/ssh - libmachine/state - - libmachine/drivers/plugin - version - libmachine/drivers/plugin/localbinary - libmachine/drivers/rpc - libmachine/version -- name: github.com/gorilla/mux - version: 9fa818a44c2bf1396a17f9d5a3c0f6dd39d2ff8e -- name: github.com/Sirupsen/logrus - version: f3cfb454f4c209e6668c95216c4744b8fddb2356 - name: golang.org/x/crypto version: beef0f4390813b96e8e68fd78570396d0f4751fc subpackages: - ssh - ssh/terminal - curve25519 -- name: google.golang.org/grpc - version: a0ff1e78a98cd140c2d18a0210ab0a2a183a2b4c - subpackages: - - credentials/oauth testImports: - name: github.com/davecgh/go-spew version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d diff --git a/glide.yaml b/glide.yaml index ab0166d..5b082a9 100644 --- a/glide.yaml +++ b/glide.yaml @@ -2,11 +2,17 @@ package: github.com/pecigonzalo/docker-machine-vmwareworkstation import: - package: github.com/docker/machine version: v0.7.0 + subpackages: + - libmachine/drivers + - libmachine/drivers/plugin + - libmachine/log + - libmachine/mcnflag + - libmachine/mcnutils + - libmachine/ssh + - libmachine/state - package: golang.org/x/crypto -- package: github.com/Sirupsen/logrus -- package: google.golang.org/grpc subpackages: - - credentials/oauth + - ssh testImport: - package: github.com/stretchr/testify version: v1.1.3