mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix default make target
The default make target should be `all` by convention but since it is not the first target it wasn't getting triggered as the default target. Fixed the makefile to make `all` the first and default target. Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
parent
e1bfa95f41
commit
5b82b93285
1 changed files with 8 additions and 8 deletions
|
@ -8,14 +8,14 @@ ciargs = -e "COVERALLS_TOKEN=$$COVERALLS_TOKEN" -e "INSIDECONTAINER=-incontainer
|
|||
cidocker = docker run ${dockerargs} ${ciargs} ${container_env} ${build_image}
|
||||
CROSS_PLATFORMS = linux/amd64 linux/386 linux/arm windows/amd64 windows/386
|
||||
|
||||
${build_image}.created:
|
||||
docker build -f Dockerfile.build -t ${build_image} .
|
||||
touch ${build_image}.created
|
||||
|
||||
all: ${build_image}.created build check integration-tests clean
|
||||
|
||||
all-local: build-local check-local integration-tests-local clean
|
||||
|
||||
${build_image}.created:
|
||||
docker build -f Dockerfile.build -t ${build_image} .
|
||||
touch ${build_image}.created
|
||||
|
||||
build: ${build_image}.created
|
||||
@echo "Building code... "
|
||||
@${docker} ./wrapmake.sh build-local
|
||||
|
@ -34,9 +34,9 @@ clean:
|
|||
cross: ${build_image}.created
|
||||
@mkdir -p "bin"
|
||||
@for platform in ${CROSS_PLATFORMS}; do \
|
||||
EXTRA_ARGS="-e GOOS=$${platform%/*} -e GOARCH=$${platform##*/}" ; \
|
||||
EXTRA_ARGS="-e GOOS=$${platform%/*} -e GOARCH=$${platform##*/}" ; \
|
||||
echo "$${platform}..." ; \
|
||||
${docker} make cross-local ; \
|
||||
${docker} make cross-local ; \
|
||||
done
|
||||
|
||||
cross-local:
|
||||
|
@ -91,9 +91,9 @@ coveralls:
|
|||
circle-ci-cross: ${build_image}.created
|
||||
@mkdir -p "bin"
|
||||
@for platform in ${CROSS_PLATFORMS}; do \
|
||||
EXTRA_ARGS="-e GOOS=$${platform%/*} -e GOARCH=$${platform##*/}" ; \
|
||||
EXTRA_ARGS="-e GOOS=$${platform%/*} -e GOARCH=$${platform##*/}" ; \
|
||||
echo "$${platform}..." ; \
|
||||
${cidocker} make cross-local ; \
|
||||
${cidocker} make cross-local ; \
|
||||
done
|
||||
|
||||
circle-ci-check: ${build_image}.created
|
||||
|
|
Loading…
Reference in a new issue