Merge pull request #4414 from nogoegst/go-get-cmd

Move cmd files under cmd/docker-machine to make it go-install-able
docker · Mar 14, 2018 · 51ed7e7 · 51ed7e7
2 parents 31e63bb + 3b022ac
commit 51ed7e7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-docker-machine*
 *.log
 *.iml
 .idea/

diff --git 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

diff --git a/cmd/machine.go → cmd/docker-machine/machine.go b/cmd/machine.go → cmd/docker-machine/machine.go
diff --git a/cmd/machine_test.go → cmd/docker-machine/machine_test.go b/cmd/machine_test.go → cmd/docker-machine/machine_test.go
diff --git 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))