From fe9351b2572e31e0836d2781c43adf40f40c6dab Mon Sep 17 00:00:00 2001 From: Ivan Markin Date: Sun, 4 Mar 2018 19:18:10 +0000 Subject: [PATCH 1/2] Move cmd files under cmd/docker-machine to make it go-install-able Signed-off-by: Ivan Markin --- .gitignore | 1 - cmd/{ => docker-machine}/machine.go | 0 cmd/{ => docker-machine}/machine_test.go | 0 mk/build.mk | 4 ++-- 4 files changed, 2 insertions(+), 3 deletions(-) rename cmd/{ => docker-machine}/machine.go (100%) rename cmd/{ => docker-machine}/machine_test.go (100%) diff --git a/.gitignore b/.gitignore index 2c63e103c8..3377ccb72f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -docker-machine* *.log *.iml .idea/ diff --git a/cmd/machine.go b/cmd/docker-machine/machine.go similarity index 100% rename from cmd/machine.go rename to cmd/docker-machine/machine.go diff --git a/cmd/machine_test.go b/cmd/docker-machine/machine_test.go similarity index 100% rename from cmd/machine_test.go rename to cmd/docker-machine/machine_test.go diff --git a/mk/build.mk b/mk/build.mk index adbe6a621d..b69acf19c2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,7 +18,7 @@ define gocross $(GO) build \ -o $(PREFIX)/bin/$(PKG_NAME)-${os.$(1)}-${arch.$(2)}$(call extension,$(GOOS)) \ -a $(VERBOSE_GO) -tags "static_build netgo $(BUILDTAGS)" -installsuffix netgo \ - -ldflags "$(GO_LDFLAGS) -extldflags -static" $(GO_GCFLAGS) ./cmd/machine.go;) + -ldflags "$(GO_LDFLAGS) -extldflags -static" $(GO_GCFLAGS) ./cmd/docker-machine;) endef build-clean: @@ -31,6 +31,6 @@ $(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS)): $(shell find . -type f -name $(GO) build \ -o $@ \ $(VERBOSE_GO) -tags "$(BUILDTAGS)" \ - -ldflags "$(GO_LDFLAGS)" $(GO_GCFLAGS) ./cmd/machine.go + -ldflags "$(GO_LDFLAGS)" $(GO_GCFLAGS) ./cmd/docker-machine build: $(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS)) From 3b022acb4ff532546b6eadf5aca41fe1e949ea11 Mon Sep 17 00:00:00 2001 From: Ivan Markin Date: Sun, 4 Mar 2018 19:36:31 +0000 Subject: [PATCH 2/2] Fix Appveyor script to use new cmd location Signed-off-by: Ivan Markin --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index cd1397a480..a32b5620fc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: clone_folder: c:\gopath\src\github.com\docker\machine build_script: - - go build -i -o ./bin/docker-machine.exe ./cmd/machine.go + - go build -i -o ./bin/docker-machine.exe ./cmd/docker-machine test_script: - powershell -Command go test -v ./libmachine/shell