From c699a1215e470b1e5ac2b13899a4a57ae71b4af1 Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Tue, 10 Jul 2018 10:20:44 +0100 Subject: [PATCH] Makefile: Run containers with --init for proper signal handling This makes it possible to Ctrl-C tests and builds again. Zombie processes will also be reaped correctly. Signed-off-by: Euan Harris --- libnetwork/Makefile | 2 +- libnetwork/wrapmake.sh | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100755 libnetwork/wrapmake.sh diff --git a/libnetwork/Makefile b/libnetwork/Makefile index 3a71655e64..d4424fac61 100644 --- a/libnetwork/Makefile +++ b/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) diff --git a/libnetwork/wrapmake.sh b/libnetwork/wrapmake.sh deleted file mode 100755 index d1a51a845f..0000000000 --- a/libnetwork/wrapmake.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e - -function raise() -{ - kill -$1 0 -} - -trap "raise SIGINT" SIGINT -make $1