docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2028 from dmp42/02-build-fixes 

Minor cleanup and fix #2022
This commit is contained in:
David Gageot 2015-10-23 18:50:04 +02:00
parent 8cfc28e37a d36fa5f9ff
commit c99bb22eeb
5 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -10,8 +10,10 @@ else
DOCKER_IMAGE_NAME := "docker-machine-build" DOCKER_IMAGE_NAME := "docker-machine-build"
DOCKER_CONTAINER_NAME := "docker-machine-build-container" DOCKER_CONTAINER_NAME := "docker-machine-build-container"
build: .ignore:
test: build @
test: .ignore
%: %:
docker build -t $(DOCKER_IMAGE_NAME) . docker build -t $(DOCKER_IMAGE_NAME) .

2
cli/.travis.yml
View File

@ -10,4 +10,4 @@ go:
script: script:
- go vet ./... - go vet ./...
- go test -race -v ./libmachine/... ./commands/... ./drivers/... - go test -race -v ./...

7
mk/main.mk
View File

@ -3,7 +3,7 @@ GO_LDFLAGS := -X `go list ./version`.GitCommit=`git rev-parse --short HEAD`
GO_GCFLAGS := GO_GCFLAGS :=
# Full package list # Full package list
PKGS := $(shell go list -tags "$(BUILDTAGS)" ./commands/... ./libmachine/... ./drivers/... | grep -v "/vendor/" | grep -v "/Godeps/") PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/Godeps/" | grep -v "/cmd")
# Support go1.5 vendoring (let us avoid messing with GOPATH or using godep) # Support go1.5 vendoring (let us avoid messing with GOPATH or using godep)
export GO15VENDOREXPERIMENT = 1 export GO15VENDOREXPERIMENT = 1
@ -32,7 +32,6 @@ VERBOSE_GO :=
GO := go GO := go
ifeq ($(VERBOSE),true) ifeq ($(VERBOSE),true)
VERBOSE_GO := -v VERBOSE_GO := -v
GO := go
endif endif
include mk/build.mk include mk/build.mk
@ -58,9 +57,7 @@ plugins: build-plugins
cross: build-x cross: build-x
clean: coverage-clean build-clean clean: coverage-clean build-clean
test: dco fmt vet test-short test: dco fmt test-short vet
validate: dco fmt vet lint test-short test-long validate: dco fmt vet lint test-short test-long
install:
cp ./bin/docker-machine* /usr/local/bin/
.PHONY: .all_build .all_coverage .all_release .all_test .all_validate test build validate clean .PHONY: .all_build .all_coverage .all_release .all_test .all_validate test build validate clean

2
mk/release.mk
View File

@ -17,8 +17,6 @@ release: clean dco fmt test test-long build-x release-pack release-checksum
$(if $(VERSION), , \ $(if $(VERSION), , \
$(error Pass the version number as the first arg. E.g.: make release 1.2.3)) $(error Pass the version number as the first arg. E.g.: make release 1.2.3))
echo $(VERSION)
git tag $(VERSION) git tag $(VERSION)
git push --tags git push --tags

12
script/test
View File

@ -1,12 +0,0 @@
#!/bin/sh
set -e
ARGS=$@
if [ -z "$ARGS" ]; then
ARGS="./libmachine/... ./commands/... ./drivers/..."
fi
echo $ARGS
docker build -t docker-machine .
exec docker run --rm docker-machine godep go test -race -v -short $ARGS