Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

Move cmd files under cmd/docker-machine to make it go-install-able #4414

Merged
merged 2 commits into from
Mar 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
docker-machine*
*.log
*.iml
.idea/
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions mk/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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))