c8edb33ecd
- First RPC steps - Work on some flaws in RPC model - Remove unused TLS settings from Engine and Swarm options - Add code to correctly encode data over the network - Add client driver for RPC - Rename server driver file - Start to make marshal make sense - Fix silly RPC method args and add client - Fix some issues with RPC calls, and marshaling - Simplify plugin main.go - Move towards 100% plugin in CLI - Ensure that plugin servers are cleaned up properly - Make flag parsing for driver flags work properly Includes some work carried from @dmp42 updating the build process and tests to use the new method. Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
37 lines
1.0 KiB
Makefile
37 lines
1.0 KiB
Makefile
# # Plain make targets if not requested inside a container
|
|
ifneq (,$(findstring test-integration,$(MAKECMDGOALS)))
|
|
include Makefile.inc
|
|
include mk/main.mk
|
|
else ifeq ($(USE_CONTAINER),)
|
|
include Makefile.inc
|
|
include mk/main.mk
|
|
else
|
|
# Otherwise, with docker, swallow all targets and forward into a container
|
|
DOCKER_IMAGE_NAME := "docker-machine-build"
|
|
DOCKER_CONTAINER_NAME := "docker-machine-build-container"
|
|
|
|
build:
|
|
test: build
|
|
%:
|
|
docker build -t $(DOCKER_IMAGE_NAME) .
|
|
|
|
test -z '$(shell docker ps -a | grep $(DOCKER_CONTAINER_NAME))' || docker rm -f $(DOCKER_CONTAINER_NAME)
|
|
|
|
docker run --name $(DOCKER_CONTAINER_NAME) \
|
|
-e DEBUG \
|
|
-e STATIC \
|
|
-e VERBOSE \
|
|
-e BUILDTAGS \
|
|
-e PARALLEL \
|
|
-e COVERAGE_DIR \
|
|
-e TARGET_OS \
|
|
-e TARGET_ARCH \
|
|
-e PREFIX \
|
|
$(DOCKER_IMAGE_NAME) \
|
|
make $@
|
|
|
|
test ! -d bin || rm -Rf bin
|
|
test -z "$(findstring build,$(patsubst cross,build,$@))" || docker cp $(DOCKER_CONTAINER_NAME):/go/src/github.com/docker/machine/bin bin
|
|
|
|
endif
|