Merge pull request #29 from docker/split-makefile

Split Makefile

Author: glours

Dockerfile

@@ -30,15 +30,15 @@ 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
+    make -f builder.Makefile lint
 
 ####
 # BUILD
 ####
 FROM builder AS build
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
-    make build
+    make -f builder.Makefile build
 
 ####
 # SCAN
@@ -51,7 +51,7 @@ COPY --from=build /go/src/github.com/docker/docker-scan/bin/docker-scan /docker-
 ####
 FROM builder AS cross-build
 RUN --mount=type=cache,target=/root/.cache/go-build \
-    make dist
+    make -f builder.Makefile cross
 
 ####
 # CROSS
@@ -95,4 +95,4 @@ RUN chmod +x /root/.docker/scan/snyk /root/e2e/snyk
 COPY --from=cli /usr/local/bin/docker /usr/local/bin/docker
 # install docker-scan plugin
 COPY --from=cross-build /go/src/github.com/docker/docker-scan/dist/docker-scan_linux_amd64/docker-scan/docker-scan /root/.docker/cli-plugins/docker-scan
-CMD ["make", "e2e-tests"]
+CMD ["make", "-f", "builder.Makefile", "e2e"]

Makefile

@@ -1,7 +1,5 @@
 export DOCKER_BUILDKIT=1
 
-NULL := /dev/null
-
 # Pinned Versions
 SNYK_DESKTOP_VERSION := 1.332.0
 SNYK_USER_VERSION := 1.334.0
@@ -17,30 +15,8 @@ BUILD_ARGS := --build-arg SNYK_DESKTOP_VERSION=$(SNYK_DESKTOP_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))
-endif
-
-ifeq ($(TAG_NAME),)
-  TAG_NAME := $(shell git describe --always --dirty --abbrev=10 2> $(NULL))
-endif
-
-PKG_NAME=github.com/docker/docker-scan
-STATIC_FLAGS= CGO_ENABLED=0
-LDFLAGS := "-s -w \
-  -X $(PKG_NAME)/internal.GitCommit=$(COMMIT) \
-  -X $(PKG_NAME)/internal.Version=$(TAG_NAME)"
-
-GO_BUILD = $(STATIC_FLAGS) go build -trimpath -ldflags=$(LDFLAGS)
-BINARY=docker-scan
-
 .PHONY: build
-build: ## Build docker-scan
-	mkdir -p bin
-	$(GO_BUILD) -o bin/$(BINARY) .
-
-.PHONY: dbuild
-dbuild: ## Build docker-scan in a container
+build: ## Build docker-scan in a container
 	docker build $(BUILD_ARGS) . \
 	--output type=local,dest=./bin \
 	--target scan
@@ -51,35 +27,22 @@ cross: ## Cross compile docker-scan binaries in a container
 	--output type=local,dest=./dist \
 	--target cross
 
-dist: ## Build cross compiled docker-scan binaries
-	GOOS=linux   GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_linux_amd64/docker-scan/$(BINARY) .
-	GOOS=darwin  GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_darwin_amd64/docker-scan/$(BINARY) .
-	GOOS=windows GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_windows_amd64/docker-scan/$(BINARY).exe .
-
 .PHONY: install
 install: build ## Install docker-scan to your local cli-plugins directory
 	cp bin/docker-scan ~/.docker/cli-plugins
 
 .PHONY: e2e-build
-e2e-build: ## Build e2e docker image 
+e2e-build:
 	docker build $(BUILD_ARGS) . --target e2e -t docker-scan:e2e
 
 .PHONY: e2e
-e2e: e2e-build
+e2e: e2e-build ## Run the end-to-end tests
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-scan:e2e
 
-.PHONY: e2e-tests
-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}'

builder.Makefile

@@ -0,0 +1,36 @@
+NULL := /dev/null
+
+ifeq ($(COMMIT),)
+  COMMIT := $(shell git rev-parse --short HEAD 2> $(NULL))
+endif
+
+ifeq ($(TAG_NAME),)
+  TAG_NAME := $(shell git describe --always --dirty --abbrev=10 2> $(NULL))
+endif
+
+PKG_NAME=github.com/docker/docker-scan
+STATIC_FLAGS= CGO_ENABLED=0
+LDFLAGS := "-s -w \
+  -X $(PKG_NAME)/internal.GitCommit=$(COMMIT) \
+  -X $(PKG_NAME)/internal.Version=$(TAG_NAME)"
+
+GO_BUILD = $(STATIC_FLAGS) go build -trimpath -ldflags=$(LDFLAGS)
+BINARY=docker-scan
+
+.PHONY: lint
+lint:
+	golangci-lint run --timeout 10m0s ./...
+
+.PHONY: e2e
+e2e:
+	go test -ldflags=$(LDFLAGS) ./e2e
+
+cross:
+	GOOS=linux   GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_linux_amd64/docker-scan/$(BINARY) .
+	GOOS=darwin  GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_darwin_amd64/docker-scan/$(BINARY) .
+	GOOS=windows GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_windows_amd64/docker-scan/$(BINARY).exe .
+
+.PHONY: build
+build:
+	mkdir -p bin
+	$(GO_BUILD) -o bin/$(BINARY) .