Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added git submodules for vendor'd depenencies
Some improvements to Makefile (namely embedded GOPATH) Allow building for Go1.6 Minor formatting fixes, bumped version to 0.2.4 Do not ignore file.Close() error Allow --verbose on init
- Loading branch information
Showing
12 changed files
with
191 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
bin/docker-fw | ||
|
||
.gopath/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
[submodule "vendor/github.com/fsouza/go-dockerclient"] | ||
path = vendor/github.com/fsouza/go-dockerclient | ||
url = https://github.com/fsouza/go-dockerclient | ||
[submodule "vendor/github.com/pborman/getopt"] | ||
path = vendor/github.com/pborman/getopt | ||
url = https://github.com/pborman/getopt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,18 @@ | ||
bin/docker-fw: | ||
mkdir -p bin .gopath | ||
if [ ! -L .gopath/src ]; then ln -s "$(CURDIR)/vendor" .gopath/src; fi | ||
cd src && GOBIN="$(CURDIR)/bin/" GOPATH="$(CURDIR)/.gopath" go install && mv ../bin/src ../bin/docker-fw | ||
|
||
.DEFAULT_GOAL := all | ||
all: bin/docker-fw errcheck test | ||
|
||
.PHONY := all deps | ||
errcheck: | ||
mkdir -p bin .gopath | ||
if [ ! -L .gopath/src ]; then ln -s "$(CURDIR)/vendor" .gopath/src; fi | ||
cd src && GOPATH="$(CURDIR)/.gopath" errcheck | ||
|
||
all: deps bin/docker-fw | ||
test: | ||
mkdir -p bin .gopath | ||
if [ ! -L .gopath/src ]; then ln -s "$(CURDIR)/vendor" .gopath/src; fi | ||
cd src && GOPATH="$(CURDIR)/.gopath" go test -v | ||
|
||
deps: | ||
go get "github.com/fsouza/go-dockerclient" | ||
go get "github.com/pborman/getopt" | ||
|
||
## build without debug information | ||
bin/docker-fw: *.go | ||
mkdir -p bin | ||
GOBIN=bin go install -ldflags "-w -s" | ||
.PHONY: all deps test errcheck bin/docker-fw |
Oops, something went wrong.