File tree Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ GO_BASE_IMAGE=golang
8
8
GO_IMAGE? =$(GO_BASE_IMAGE ) :$(GO_VERSION ) -buster
9
9
GEN_DEB_VER =$(shell ./gen-deb-ver $(realpath $(CURDIR ) /../src/github.com/docker/cli) "$(VERSION ) ")
10
10
EPOCH? =5
11
+ DOCKER_BUILDKIT =1
12
+ BUILD_TARGET =final
11
13
12
14
ifdef BUILD_IMAGE
13
15
BUILD_IMAGE_FLAG=--build-arg $(BUILD_IMAGE)
@@ -19,6 +21,11 @@ BUILD?=DOCKER_BUILDKIT=1 \
19
21
$(BUILD_IMAGE_FLAG ) \
20
22
--build-arg GO_IMAGE=$(GO_IMAGE ) \
21
23
--build-arg COMMON_FILES=$(COMMON_FILES ) \
24
+ --build-arg VERSION=$(word 2, $(DEB_VERSION ) ) \
25
+ --build-arg DOCKER_GITCOMMIT=$(GITCOMMIT ) \
26
+ --build-arg PLATFORM \
27
+ --target=$(BUILD_TARGET ) \
28
+ $(BUILD_OPTS ) \
22
29
-t debbuild-$@ /$(ARCH ) \
23
30
-f $@ /Dockerfile \
24
31
.
@@ -56,6 +63,12 @@ clean: ## remove build artifacts
56
63
.PHONY : deb
57
64
deb : ubuntu debian # # build all deb packages except for raspbian
58
65
66
+ .PHONY : binaries
67
+ binaries : BUILD_TARGET=binaries
68
+ binaries : BUILD_OPTS=--output type=local,dest=build
69
+ binaries : deb
70
+
71
+
59
72
.PHONY : ubuntu
60
73
ubuntu : $(UBUNTU_VERSIONS ) # # build all ubuntu deb packages
61
74
@@ -69,8 +82,8 @@ raspbian: $(RASPBIAN_VERSIONS) ## build all raspbian deb packages
69
82
$(DISTROS ) : sources/cli.tgz sources/engine.tgz sources/docker.service sources/docker.socket sources/plugin-installers.tgz
70
83
@echo " == Building packages for $@ =="
71
84
$(BUILD )
72
- $(RUN )
73
- $(CHOWN ) -R $(shell id -u) :$(shell id -g) debbuild/$@
85
+ # $(RUN)
86
+ # $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
74
87
75
88
sources/engine.tgz :
76
89
mkdir -p $(@D )
You can’t perform that action at this time.
0 commit comments