From e3f677794ad00ed77299852dc9b20ce536680a6f Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 2 May 2017 15:10:03 -0400 Subject: [PATCH] Add gometalinter to CI Signed-off-by: Daniel Nephin --- Makefile | 5 ++++- circle.yml | 9 ++++++++- cli/command/container/exec_test.go | 10 +++++----- docker.Makefile | 21 +++++++++++++++------ dockerfiles/Dockerfile.lint | 12 ++++++++++++ gometalinter.json | 8 ++++++++ 6 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 dockerfiles/Dockerfile.lint create mode 100644 gometalinter.json diff --git a/Makefile b/Makefile index 04aa21e182..dadad7c584 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # github.com/docker/cli # -.PHONY: build clean cross +.PHONY: build clean cross test lint # build the CLI build: clean @@ -17,6 +17,9 @@ clean: test: @go test -tags daemon -v $(shell go list ./... | grep -v /vendor/) +lint: + @gometalinter --config gometalinter.json ./... + # build the CLI for multiple architectures cross: clean @gox -output build/docker-{{.OS}}-{{.Arch}} \ diff --git a/circle.yml b/circle.yml index 0a6e1dbfb7..29fd13c3ba 100644 --- a/circle.yml +++ b/circle.yml @@ -7,4 +7,11 @@ jobs: steps: - checkout - setup_remote_docker - - run: docker build -f dockerfiles/Dockerfile.ci . + - run: + name: "Lint" + command: | + docker build -f dockerfiles/Dockerfile.lint --tag cli-linter . + docker run cli-linter + - run: + name: "Build and Unit Test" + command: docker build -f dockerfiles/Dockerfile.ci . diff --git a/cli/command/container/exec_test.go b/cli/command/container/exec_test.go index baeeaf1904..e94beb4545 100644 --- a/cli/command/container/exec_test.go +++ b/cli/command/container/exec_test.go @@ -13,21 +13,21 @@ type arguments struct { func TestParseExec(t *testing.T) { valids := map[*arguments]*types.ExecConfig{ - &arguments{ + { execCmd: []string{"command"}, }: { Cmd: []string{"command"}, AttachStdout: true, AttachStderr: true, }, - &arguments{ + { execCmd: []string{"command1", "command2"}, }: { Cmd: []string{"command1", "command2"}, AttachStdout: true, AttachStderr: true, }, - &arguments{ + { options: execOptions{ interactive: true, tty: true, @@ -42,7 +42,7 @@ func TestParseExec(t *testing.T) { Tty: true, Cmd: []string{"command"}, }, - &arguments{ + { options: execOptions{ detach: true, }, @@ -54,7 +54,7 @@ func TestParseExec(t *testing.T) { Detach: true, Cmd: []string{"command"}, }, - &arguments{ + { options: execOptions{ tty: true, interactive: true, diff --git a/docker.Makefile b/docker.Makefile index 81865e4c5c..a5a08c2527 100644 --- a/docker.Makefile +++ b/docker.Makefile @@ -6,29 +6,38 @@ +.PHONY: build_docker_image build clean cross dev -DEV_DOCKER_IMAGE_NAME = docker_cli_dev +DEV_DOCKER_IMAGE_NAME = docker-cli-dev +LINTER_IMAGE_NAME = docker-cli-lint +MOUNTS = -v `pwd`:/go/src/github.com/docker/cli # build docker image (dockerfiles/Dockerfile.build) build_docker_image: @docker build -q -t $(DEV_DOCKER_IMAGE_NAME) -f ./dockerfiles/Dockerfile.build . +.PHONY: builder_linter_image +build_linter_image: + @docker build -q -t $(LINTER_IMAGE_NAME) -f ./dockerfiles/Dockerfile.lint . + # build executable using a container build: build_docker_image @echo "WARNING: this will drop a Linux executable on your host (not a macOS of Windows one)" - @docker run --rm -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) make build + @docker run --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make build # clean build artifacts using a container clean: build_docker_image - @docker run --rm -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) make clean + @docker run --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make clean # run go test test: build_docker_image - @docker run --rm -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) make test + @docker run --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make test # build the CLI for multiple architectures using a container cross: build_docker_image - @docker run --rm -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) make cross + @docker run --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make cross # start container in interactive mode for in-container development dev: build_docker_image - @docker run -ti -v `pwd`:/go/src/github.com/docker/cli $(DEV_DOCKER_IMAGE_NAME) ash \ No newline at end of file + @docker run -ti $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) ash + +lint: build_linter_image + @docker run -ti $(MOUNTS) $(LINTER_IMAGE_NAME) diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint new file mode 100644 index 0000000000..9050e05325 --- /dev/null +++ b/dockerfiles/Dockerfile.lint @@ -0,0 +1,12 @@ +FROM golang:1.8-alpine + +RUN apk add -U git + +RUN go get -u gopkg.in/alecthomas/gometalinter.v1 && \ + mv /go/bin/gometalinter.v1 /usr/local/bin/gometalinter && \ + gometalinter --install + +WORKDIR /go/src/github.com/docker/cli +COPY . . +ENTRYPOINT ["/usr/local/bin/gometalinter"] +CMD ["--config=gometalinter.json", "./..."] diff --git a/gometalinter.json b/gometalinter.json new file mode 100644 index 0000000000..f3aa2725cb --- /dev/null +++ b/gometalinter.json @@ -0,0 +1,8 @@ +{ + "Vendor": true, + "Sort": ["linter", "severity"], + "Exclude": ["cli/compose/schema/bindata.go"], + + "DisableAll": true, + "Enable": ["gofmt", "vet"] +}