Split makefiles

* Makefile is for users to use
* builder.Makefile is used by the builder container

Dockerfile

@@ -19,26 +19,26 @@ RUN go mod download
 ADD . ${PWD}
 
 FROM fs AS make-protos
-RUN make protos
+RUN make -f builder.Makefile protos
 
-FROM make-protos AS make-bins
+FROM make-protos AS make-cli
 RUN --mount=type=cache,target=/root/.cache/go-build \
     GOOS=${TARGET_OS} \
     GOARCH=${TARGET_ARCH} \
-    make bins
+    make -f  builder.Makefile cli
 
-FROM make-protos as make-test
+FROM make-protos AS make-xcli
-RUN make test
-
-FROM make-protos AS make-xbins
 RUN --mount=type=cache,target=/root/.cache/go-build \
-    make xbins
+    make -f builder.Makefile xcli
 
 FROM scratch AS protos
 COPY --from=make-protos /go/src/github.com/docker/api .
 
-FROM scratch AS bins
+FROM scratch AS cli
-COPY --from=make-bins /go/src/github.com/docker/api/bin/* .
+COPY --from=make-cli /go/src/github.com/docker/api/bin/* .
 
-FROM scratch AS xbins
+FROM scratch AS xcli
-COPY --from=make-xbins /go/src/github.com/docker/api/bin/* .
+COPY --from=make-xcli /go/src/github.com/docker/api/bin/* .
+
+FROM make-protos as test
+RUN make -f builder.Makefile test

Makefile

@@ -31,47 +31,31 @@ PROTOS=$(shell find . -name \*.proto)
 
 export DOCKER_BUILDKIT=1
 
-all: dbins
+all: cli
-xall: dxbins
-bins: cli example
-xbins: xcli xexample
 
 protos:
-	@protoc -I. --go_out=plugins=grpc,paths=source_relative:. ${PROTOS}
+	@docker build . \
-	@goimports -w -local github.com/docker/api .
-
-cli: protos
-	GOOS=${GOOS} GOARCH=${GOARCH} go build -v -o bin/docker ./cli
-
-xcli: cli
-	GOOS=linux   GOARCH=amd64 go build -v -o bin/docker-linux-amd64 ./cli
-	GOOS=darwin  GOARCH=amd64 go build -v -o bin/docker-darwin-amd64 ./cli
-	GOOS=windows GOARCH=amd64 go build -v -o bin/docker-windows-amd64.exe ./cli
-
-dprotos:
-	docker build . \
-	--output type=local,dest=. \
 	--target protos
 
-dbins: dprotos
+cli:
-	docker build . \
+	@docker build . \
 	--output type=local,dest=./bin \
 	--build-arg TARGET_OS=${GOOS} \
 	--build-arg TARGET_ARCH=${GOARCH} \
-	--target bins
+	--target cli
 
-dxbins: dbins
+xcli:
-	docker build . \
+	@docker build . \
 	--output type=local,dest=./bin \
-	--target xbins
+	--target xcli
-
-dtest:
-	docker build . \
-	--target make-test
 
 test:
-	gotestsum ./...
+	@docker build . \
+	--target test
+
+cache-clear:
+	@docker builder prune --force --filter type=exec.cachemount --filter=unused-for=24h
 
 FORCE:
 
-.PHONY: all xall protos xcli cli bins dbins dxbins dprotos
+.PHONY: all protos cli xcli

builder.Makefile

@@ -0,0 +1,53 @@
+# Copyright (c) 2020 Docker Inc.
+
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED,
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH
+# THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+GIT_COMMIT=$(shell git rev-parse --short HEAD)
+GOOS ?= $(shell go env GOOS)
+GOARCH ?= $(shell go env GOARCH)
+
+PROTOS=$(shell find . -name \*.proto)
+
+export DOCKER_BUILDKIT=1
+
+all: cli
+
+protos:
+	@protoc -I. --go_out=plugins=grpc,paths=source_relative:. ${PROTOS}
+	@goimports -w -local github.com/docker/api .
+
+cli:
+	GOOS=${GOOS} GOARCH=${GOARCH} go build -v -o bin/docker ./cli
+
+xcli:
+	@GOOS=linux   GOARCH=amd64 go build -v -o bin/docker-linux-amd64 ./cli
+	@GOOS=darwin  GOARCH=amd64 go build -v -o bin/docker-darwin-amd64 ./cli
+	@GOOS=windows GOARCH=amd64 go build -v -o bin/docker-windows-amd64.exe ./cli
+
+test:
+	@gotestsum ./...
+
+FORCE:
+
+.PHONY: all protos cli xcli