Merge pull request #28 from docker/refactor-makefile

Add lint target to the Makefile

Author: glours

Dockerfile

@@ -2,7 +2,11 @@
 ARG GO_VERSION=1.14.3
 ARG CLI_VERSION=19.03.9
 ARG ALPINE_VERSION=3.12.0
+ARG GOLANGCI_LINT_VERSION=v1.27.0-alpine
 
+####
+# BUILDER
+####
 FROM golang:${GO_VERSION} AS builder
 WORKDIR /go/src/github.com/docker/docker-scan
 
@@ -12,23 +16,57 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     go mod download
 COPY . .
 
+####
+# LINT-BASE
+####
+FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION} AS lint-base
+
+####
+# LINT
+####
+FROM builder AS lint
+ENV CGO_ENABLED=0
+COPY --from=lint-base /usr/bin/golangci-lint /usr/bin/golangci-lint
+RUN --mount=target=. \
+    --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/root/.cache/golangci-lint \
+    make linter
+
+####
+# BUILD
+####
 FROM builder AS build
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
     make build
 
+####
+# SCAN
+####
 FROM scratch AS scan
 COPY --from=build /go/src/github.com/docker/docker-scan/bin/docker-scan /docker-scan
 
+####
+# CROSS_BUILD
+####
 FROM builder AS cross-build
 RUN --mount=type=cache,target=/root/.cache/go-build \
     make dist
 
+####
+# CROSS
+####
 FROM scratch AS cross
 COPY --from=cross-build /go/src/github.com/docker/docker-scan/dist /
 
+####
+# CLI
+####
 FROM docker:${CLI_VERSION} AS cli
 
+####
+# SNYK
+####
 FROM alpine:${ALPINE_VERSION} AS snyk
 ARG SNYK_DESKTOP_VERSION=1.332.0
 ARG SNYK_USER_VERSION=1.334.0
@@ -40,6 +78,9 @@ RUN wget https://github.com/snyk/snyk/releases/download/v${SNYK_DESKTOP_VERSION}
 # install snyk user binary
 RUN wget https://github.com/snyk/snyk/releases/download/v${SNYK_USER_VERSION}/snyk-linux -O snyk-user
 
+####
+# E2E
+####
 FROM builder AS e2e
 ARG SNYK_DESKTOP_VERSION=1.332.0
 ENV SNYK_DESKTOP_VERSION=${SNYK_DESKTOP_VERSION}

Makefile

@@ -1,14 +1,21 @@
 export DOCKER_BUILDKIT=1
 
 NULL := /dev/null
+
+# Pinned Versions
 SNYK_DESKTOP_VERSION := 1.332.0
 SNYK_USER_VERSION := 1.334.0
 GO_VERSION := 1.14.3
 CLI_VERSION := 19.03.9
+ALPINE_VERSION := 3.12.0
+GOLANGCI_LINT_VERSION := v1.27.0-alpine
+
 BUILD_ARGS := --build-arg SNYK_DESKTOP_VERSION=$(SNYK_DESKTOP_VERSION)\
 	--build-arg SNYK_USER_VERSION=$(SNYK_USER_VERSION)\
 	--build-arg GO_VERSION=$(GO_VERSION)\
-	--build-arg CLI_VERSION=$(CLI_VERSION)
+	--build-arg CLI_VERSION=$(CLI_VERSION)\
+	--build-arg ALPINE_VERSION=$(ALPINE_VERSION)\
+	--build-arg GOLANGCI_LINT_VERSION=$(GOLANGCI_LINT_VERSION)
 
 ifeq ($(COMMIT),)
   COMMIT := $(shell git rev-parse --short HEAD 2> $(NULL))
@@ -65,6 +72,14 @@ e2e: e2e-build
 e2e-tests:
 	go test -ldflags=$(LDFLAGS) ./e2e
 
+.PHONY: lint
+lint: ## Run the go linter
+	@docker build . --target lint
+
+.PHONY: linter
+linter:
+	golangci-lint run --timeout 10m0s ./...
+
 help: ## Show help
 	@echo Please specify a build target. The choices are:
 	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'