Rework debian packaging to build binaries directly

ce.mk

@@ -0,0 +1,2 @@
+DEFAULT_PRODUCT_LICENSE?=Community Engine
+PLATFORM?=Docker Engine - Community

deb/Makefile

@@ -1,8 +1,9 @@
-include ../containerd.mk
+include ../ce.mk
 
 SHELL:=/bin/bash
 ARCH:=$(shell uname -m)
 CLI_DIR:=$(CURDIR)/../../cli
+ENGINE_DIR:=$(CURDIR)/../../engine
 GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
 VERSION?=0.0.0-dev
 GO_BASE_IMAGE=golang
@@ -21,21 +22,21 @@ BUILD?=docker build \
 	$(BUILD_IMAGE_FLAG) \
 	--build-arg GO_IMAGE=$(GO_IMAGE) \
 	--build-arg COMMON_FILES=$(COMMON_FILES) \
-	--build-arg CONTAINERD_SHIM_PROCESS_IMAGE=$(CONTAINERD_SHIM_PROCESS_IMAGE) \
 	-t debbuild-$@/$(ARCH) \
 	-f $(CURDIR)/$@/Dockerfile .
-RUN=docker run --rm -i \
+RUN?=docker run --rm -i \
 	-e EPOCH='$(EPOCH)' \
 	-e DEB_VERSION=$(word 1, $(DEB_VERSION)) \
 	-e VERSION=$(word 2, $(DEB_VERSION)) \
 	-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
+	-e PLATFORM="$(PLATFORM)" \
+	-e PRODUCT="$(PRODUCT)" \
+	-e DEFAULT_PRODUCT_LICENSE="$(DEFAULT_PRODUCT_LICENSE)" \
 	-v $(CURDIR)/debbuild/$@:/build \
 	debbuild-$@/$(ARCH)
 
-SOURCE_FILES=containerd-proxy.tgz cli.tgz docker.service dockerd.json engine.tar
+SOURCE_FILES=cli.tgz engine.tgz docker.service
 SOURCES=$(addprefix sources/, $(SOURCE_FILES))
-ENGINE_IMAGE=docker/engine-community
-ENGINE_SCOPE=ce
 
 IMAGE_TAG=nightly
 
@@ -133,29 +134,16 @@ sources/cli.tgz:
 		alpine \
 		tar -C / -c -z -f /v/cli.tgz --exclude .git cli
 
-sources/containerd-proxy.tgz:
-	mkdir -p tmp/
-	curl -fL -o tmp/containerd-proxy.tgz "https://github.com/crosbymichael/containerd-proxy/archive/$(CONTAINERD_PROXY_COMMIT).tar.gz"
-	tar xzf tmp/containerd-proxy.tgz -C tmp/
-	mv tmp/containerd-proxy-$(CONTAINERD_PROXY_COMMIT) tmp/containerd-proxy
+sources/engine.tgz:
 	mkdir -p $(@D)
-	$(CHOWN) -R $(shell id -u):$(shell id -g) $$(dirname $(@D))
-	tar -zcf $@ -C tmp/ containerd-proxy
-	rm -rf tmp/
+	docker run --rm -i -w /v \
+		-v $(ENGINE_DIR):/docker \
+		-v $(CURDIR)/$(@D):/v \
+		alpine \
+		tar -C / -c -z -f /v/engine.tgz --exclude .git docker
 
 sources/docker.service: ../systemd/docker.service
 	mkdir -p $(@D)
 	cp $< $@
 
-sources/dockerd.json: ../common/dockerd.json
-	mkdir -p $(@D)
-	sed \
-	    -e 's!$${ENGINE_IMAGE}!$(ENGINE_IMAGE)!' \
-	    -e 's!$${ENGINE_SCOPE}!$(ENGINE_SCOPE)!' \
-	    -e 's/$${IMAGE_TAG}/$(IMAGE_TAG)/' \
-	    $< > $@
-
-# offline bundle
-sources/engine.tar: 
-	$(MAKE) -C ../image ENGINE_IMAGE=$(ENGINE_IMAGE) ENGINE_SCOPE=$(ENGINE_SCOPE) engine-$(ARCH).tar
-	mv ../image/engine-$(ARCH).tar $@
+-include ../ee.mk

deb/common/control

@@ -2,12 +2,22 @@ Source: docker-ce
 Section: admin
 Priority: optional
 Maintainer: Docker <support@docker.com>
-Build-Depends: bash-completion,
+Build-Depends: bash,
+               bash-completion,
+               btrfs-tools | libbtrfs-dev,
+               ca-certificates,
+               cmake,
                dh-apparmor,
                dh-systemd,
+               gcc,
+               git,
+               libc-dev,
+               libdevmapper-dev,
                libltdl-dev,
+               libseccomp-dev,
+               libtool,
                make,
-               gcc
+               pkg-config
 Standards-Version: 3.9.6
 Homepage: https://docker.com
 Vcs-Browser: https://github.com/docker/docker

deb/common/rules

@@ -10,8 +10,11 @@ override_dh_gencontrol:
 override_dh_auto_build:
 	cd /go/src/github.com/docker/cli && \
 		LDFLAGS='' DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$(VERSION) GITCOMMIT=$(DOCKER_GITCOMMIT) dynbinary manpages
-	cd /go/src/github.com/crosbymichael/containerd-proxy && \
-		make SCOPE_LABEL="com.docker/containerd-proxy.scope" ANY_SCOPE="ee" bin/containerd-proxy
+	cd /go/src/github.com/docker/docker && \
+		./hack/make.sh dynbinary
+	for component in tini "proxy dynamic";do \
+		cd /go/src/github.com/docker/docker; TMP_GOPATH="/go" hack/dockerfile/install/install.sh $$component; \
+	done
 
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
@@ -22,11 +25,10 @@ override_dh_auto_install:
 	install -D -m 0644 /go/src/github.com/docker/cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
 	install -D -m 0755 /go/src/github.com/docker/cli/build/docker debian/docker-ce-cli/usr/bin/docker
 	# docker-ce install
-	install -D -m 0755 /go/src/github.com/crosbymichael/containerd-proxy/bin/containerd-proxy debian/docker-ce/usr/bin/dockerd
-	install -D -m 0644 /containerd-shim-process-v1 debian/docker-ce/usr/sbin/containerd-shim-process-v1
-	install -D -m 0644 /sources/engine.tar debian/docker-ce/var/lib/docker-engine/engine.tar
 	install -D -m 0644 /sources/docker.service debian/docker-ce/lib/systemd/system/docker.service
-	install -D -m 0644 /sources/dockerd.json debian/docker-ce/etc/containerd-proxy/dockerd.json
+	install -D -m 0755 /go/src/github.com/docker/docker/bundles/dynbinary-daemon/dockerd debian/docker-ce/usr/bin/dockerd
+	install -D -m 0755 /usr/local/bin/docker-init debian/docker-ce/usr/bin/docker-init
+	install -D -m 0755 /usr/local/bin/docker-proxy debian/docker-ce/usr/bin/docker-proxy
 
 
 override_dh_install:

deb/debian-buster/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=debian:buster
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO debian
 ENV SUITE buster
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb

deb/debian-jessie/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=debian:jessie
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO debian
 ENV SUITE jessie
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb

deb/debian-stretch/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=debian:stretch
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO debian
 ENV SUITE stretch
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb

deb/raspbian-jessie/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=resin/rpi-raspbian:jessie
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO raspbian
 ENV SUITE jessie
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb

deb/raspbian-stretch/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=resin/rpi-raspbian:stretch
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO raspbian
 ENV SUITE stretch
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb

deb/ubuntu-bionic/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=ubuntu:bionic
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO ubuntu
 ENV SUITE bionic
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb

deb/ubuntu-trusty/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=ubuntu:trusty
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO ubuntu
 ENV SUITE trusty
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb

deb/ubuntu-xenial/Dockerfile

@@ -1,8 +1,6 @@
 ARG GO_IMAGE
-ARG CONTAINERD_SHIM_PROCESS_IMAGE
 ARG BUILD_IMAGE=ubuntu:xenial
 FROM ${GO_IMAGE} as golang
-FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
 
 FROM ${BUILD_IMAGE}
 
@@ -21,15 +19,15 @@ RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-reco
 # Copy our sources and untar them
 COPY sources/ /sources
 RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/
-RUN mkdir -p /go/src/github.com/crosbymichael && tar -xzf /sources/containerd-proxy.tgz -C /go/src/github.com/crosbymichael
+RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/engine.tgz -C /go/src/github.com/docker/
 
 RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli
+RUN ln -snf /go/src/github.com/docker/engine /root/build-deb/engine
 
 ENV DISTRO ubuntu
 ENV SUITE xenial
 
 COPY --from=golang /usr/local/go /usr/local/go
-COPY --from=shim-process /bin/containerd-shim-process-v1 /containerd-shim-process-v1
 
 WORKDIR /root/build-deb
 COPY build-deb /root/build-deb/build-deb