Merge pull request #2228 from euanh/use-init

Makefile: Run containers with --init for proper signal handling

libnetwork/Makefile

@@ -4,7 +4,7 @@ dockerbuildargs ?= --target dev - < Dockerfile
 dockerargs ?= --privileged -v $(shell pwd):/go/src/github.com/docker/libnetwork -w /go/src/github.com/docker/libnetwork
 build_image=libnetworkbuild
 container_env = -e "INSIDECONTAINER=-incontainer=true"
-docker = docker run --rm -it ${dockerargs} $$EXTRA_ARGS ${container_env} ${build_image}
+docker = docker run --rm -it --init ${dockerargs} $$EXTRA_ARGS ${container_env} ${build_image}
 CROSS_PLATFORMS = linux/amd64 linux/386 linux/arm windows/amd64
 PACKAGES=$(shell go list ./... | grep -v /vendor/)
 export PATH := $(CURDIR)/bin:$(PATH)

libnetwork/wrapmake.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-function raise()
-{
-    kill -$1 0
-}
-
-trap "raise SIGINT" SIGINT
-make $1