From 7f7e842702b0e435a6e4be11ab1db87dc2769fcf Mon Sep 17 00:00:00 2001 From: Gaetan de Villele Date: Wed, 3 May 2017 11:14:06 -0700 Subject: [PATCH] =?UTF-8?q?define=20targets=20as=20=E2=80=9Cphony=E2=80=9D?= =?UTF-8?q?,=20add=20comments,=20and=20mount=20docker.sock=20in=20dev=20ta?= =?UTF-8?q?rget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaetan de Villele --- Makefile | 3 ++- docker.Makefile | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dadad7c584..19ef173ee1 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # github.com/docker/cli # -.PHONY: build clean cross test lint +.PHONY: build clean test lint cross # build the CLI build: clean @@ -17,6 +17,7 @@ clean: test: @go test -tags daemon -v $(shell go list ./... | grep -v /vendor/) +# run linters lint: @gometalinter --config gometalinter.json ./... diff --git a/docker.Makefile b/docker.Makefile index a5a08c2527..c2f9ff5626 100644 --- a/docker.Makefile +++ b/docker.Makefile @@ -4,7 +4,7 @@ # Makefile for developing using Docker # -+.PHONY: build_docker_image build clean cross dev ++.PHONY: build_docker_image build_linter_image build clean test cross dev lint DEV_DOCKER_IMAGE_NAME = docker-cli-dev LINTER_IMAGE_NAME = docker-cli-lint @@ -37,7 +37,8 @@ cross: build_docker_image # start container in interactive mode for in-container development dev: build_docker_image - @docker run -ti $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) ash + @docker run -ti $(MOUNTS) -v /var/run/docker.sock:/var/run/docker.sock $(DEV_DOCKER_IMAGE_NAME) ash +# run linters in a container lint: build_linter_image @docker run -ti $(MOUNTS) $(LINTER_IMAGE_NAME)