Split docker cli into separate package, deb packaging

deb/Makefile

@@ -1,11 +1,10 @@
 SHELL:=/bin/bash
 ARCH:=$(shell uname -m)
-ENGINE_DIR:=$(CURDIR)/../../engine
 CLI_DIR:=$(CURDIR)/../../cli
-GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
+GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD)
 VERSION?=0.0.0-dev
 GO_VERSION:=1.10.3
-DEB_VERSION=$(shell ./gen-deb-ver $(ENGINE_DIR) "$(VERSION)")
+DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 EPOCH?=2
 
@@ -16,7 +15,6 @@ RUN=docker run --rm -i \
 	-e VERSION=$(word 2, $(DEB_VERSION)) \
 	-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
 	-v $(CURDIR)/debbuild/$@:/build \
-	-v $(ENGINE_DIR):/engine \
 	-v $(CLI_DIR):/cli \
 	-v $(CURDIR)/systemd:/root/build-deb/systemd \
 	debbuild-$@/$(ARCH)

deb/build-deb

@@ -13,18 +13,9 @@ if [[ -z "$DEB_VERSION" ]]; then
     exit 1
 fi
 
-(
-    set -e
-    cd engine
-    # I want to rip this install-binaries script out so badly
-    for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
-        TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
-    done
-)
-
 echo VERSION AAA $VERSION
 
-VERSION=${VERSION:-$( cat engine/VERSION )}
+VERSION=${VERSION:-$( cat cli/VERSION )}
 
 echo VERSION bbb $VERSION
 
@@ -40,7 +31,7 @@ EOF
 # The space above at the start of the line for the debMaintainer is very important
 
 # Give the script a git commit because it wants it
-export DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT-$($GIT_COMMAND rev-parse --short HEAD)}
+export DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT-$(cd cli; $GIT_COMMAND rev-parse --short HEAD)}
 
 echo VERSION BBB $VERSION
 dpkg-buildpackage -uc -us -I.git

deb/common/control

@@ -9,8 +9,8 @@ Vcs-Git: git://github.com/docker/docker.git
 
 Package: docker-ce
 Architecture: linux-any
-Depends: iptables, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
-Recommends: aufs-tools,
+Depends: docker-ce-cli, containerd, ${shlibs:Depends}
+Recommends: abufs-tools,
             ca-certificates,
             cgroupfs-mount | cgroup-lite,
             git,
@@ -29,3 +29,28 @@ Description: Docker: the open-source application container engine
  language, framework or packaging system. That makes them great building blocks
  for deploying and scaling web apps, databases, and backend services without
  depending on a particular stack or provider.
+
+Source: docker-ce-cli
+Section: admin
+Priority: optional
+Maintainer: Docker <[email protected]>
+Standards-Version: 3.9.6
+Homepage: https://dockerproject.org
+Vcs-Browser: https://github.com/docker/cli
+Vcs-Git: git://github.com/docker/cli.git
+Package: docker-ce-cli
+Architecture: linux-any
+Depends: ${shlibs:Depends}
+Recommends:
+Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs, docker-ee-cli
+Replaces:
+Description: Docker CLI: the open-source application container engine
+ Docker is an open source project to build, ship and run any application as a
+ lightweight container
+ .
+ Docker containers are both hardware-agnostic and platform-agnostic. This means
+ they can run anywhere, from your laptop to the largest EC2 compute instance and
+ everything in between - and they don't require you to use a particular
+ language, framework or packaging system. That makes them great building blocks
+ for deploying and scaling web apps, databases, and backend services without
+ depending on a particular stack or provider.

deb/common/docker-ce-cli.install

@@ -0,0 +1,2 @@
+cli/contrib/completion/fish/docker.fish usr/share/fish/vendor_completions.d/
+cli/contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/

deb/common/docker-ce.postinst

@@ -7,6 +7,10 @@ case "$1" in
 			if ! getent group docker > /dev/null; then
 				groupadd --system docker
 			fi
+                        # TODO Needs upgrade vs. install logic handling here
+                        if ctr --namespace docker container info dockerd 2&>1  > /dev/null ; then
+                            docker engine init
+                        fi
 		fi
 		;;
 	abort-*)

deb/common/docs

@@ -1 +1 @@
-engine/README.md
+cli/README.md