From 552547834bba520f422cba7cc212c94227bdff0c Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Fri, 13 May 2016 11:44:01 -0700 Subject: [PATCH 1/2] Install containerd binaries into built docker image Signed-off-by: Kenfe-Mickael Laventure --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7c172c3..23cf54b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,3 +47,5 @@ RUN set -x \ COPY . /go/src/github.com/docker/containerd WORKDIR /go/src/github.com/docker/containerd + +RUN make all install From 496007897f2f2e8ed2155cda1a0cdce0839ed1de Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Fri, 13 May 2016 11:44:33 -0700 Subject: [PATCH 2/2] Remove unneeded compilation when running test Signed-off-by: Kenfe-Mickael Laventure --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index de1c359..f5d074b 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ lint: shell: dbuild $(DOCKER_RUN) bash -test: all validate +test: validate go test -v $(shell go list ./... | grep -v /vendor | grep -v /integration-test) ifneq ($(wildcard /.dockerenv), ) $(MAKE) install bundles-rootfs