docker: updated to version 17.09.0-ce

4 files changed, 41 insertions, 19 deletions

diff --git a/docker/.footprint b/docker/.footprint
index 0ff6ae9f9..ccc22d1e6 100644
--- a/docker/.footprint
+++ b/docker/.footprint
@@ -28,6 +28,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/docker-checkpoint-rm.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-checkpoint.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-commit.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-config-create.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-config-inspect.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-config-ls.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-config-rm.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-container-attach.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-container-commit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-container-cp.1.gz
@@ -134,6 +139,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/docker-service-ls.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-service-ps.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-service-rm.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-service-rollback.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-service-scale.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-service-update.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-service.1.gz
@@ -146,6 +152,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/docker-start.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-stats.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-stop.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-swarm-ca.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-swarm-init.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-swarm-join-token.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-swarm-join.1.gz
diff --git a/docker/.md5sum b/docker/.md5sum
index fa62b423c..2952a47e0 100644
--- a/docker/.md5sum
+++ b/docker/.md5sum
@@ -1,5 +1,5 @@
-98db409f71d8b1531f94a1cf95f676e0  docker-17.05.0-ce.tar.gz
-92fc59792dbca4683767ed21c46390fd  docker-man-pages-17.05.0-ce.tar.xz
+e0df90392b2daa545562342dabf181cf  docker-ce-v17.09.0-ce.tar.gz
+c1c52ebce61e150955304cb9e5eb4193  docker-man-pages-17.09.0-ce.tar.xz
 639d3af72199001bb612e545335a67a3  docker.conf
 d83f39cc5876fed6daecfbd28cfed4c1  docker.rc
 301aa0330b9fbd1094fd4041afd21340  libnetwork-7b2b1fe.tar.xz
diff --git a/docker/.signature b/docker/.signature
index f78278ae6..9110d2de9 100644
--- a/docker/.signature
+++ b/docker/.signature
@@ -1,9 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34cJ8a6h6+hQQ4V8JwZOaeryUKkcXneC/y/hWS5VePMYj/WF6xp3NxyVMXMEJie8G5aLy6DY27DiynWkOupegg4=
-SHA256 (Pkgfile) = 7c8bda835d8cc40ed8d81591f886080d8f53d4c5a1a97bf865e3ed42df1903f2
-SHA256 (.footprint) = 9edebdc17e740908878dfbe976009c04567e3c527937e91a8aeb12e87eb632b7
-SHA256 (docker-17.05.0-ce.tar.gz) = 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121
-SHA256 (docker-man-pages-17.05.0-ce.tar.xz) = a2915cac551eb4bf47dff35293f08871218b2119f287e4211f95fc4a1c8b2c70
+RWSagIOpLGJF32qc8hstFXp9NheVbmqHhYKl1UdqeIdZvlfDjSoEAV7qbvUIiejcIDB1VdnpksrCiUaq4pCfwjicRDt2njV+CAs=
+SHA256 (Pkgfile) = 69222da3b1141c028eba4958aa74ee1d69daf86407ebf9766690c1d971ee9b9b
+SHA256 (.footprint) = 07676e9b0f0e9f22f814a78b98c2dd295bef5aeed8e7b3a3396ee2beddeab911
+SHA256 (docker-ce-v17.09.0-ce.tar.gz) = ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae
+SHA256 (docker-man-pages-17.09.0-ce.tar.xz) = f9b08e0f65f45a7818c6df8701927def25709682f331bfa324fdf8e90f2d625c
 SHA256 (libnetwork-7b2b1fe.tar.xz) = ba99d9d95f21357013d59f11caa0cd3b6cbae24881672a83fb26d30c02266d00
 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c
 SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e
diff --git a/docker/Pkgfile b/docker/Pkgfile
index d381c9c40..522c0d0da 100644
--- a/docker/Pkgfile
+++ b/docker/Pkgfile
@@ -1,26 +1,41 @@
 # Description: An open platform for distributed applications for developers and sysadmins
-# URL: https://www.docker.com/
+# URL: https://www.docker.com/community-edition
 # Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: containerd runc btrfs-progs cgroupfs-mount
 
 name=docker
-version=17.05.0-ce
+version=17.09.0-ce
 release=1
-source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \
+source=(https://github.com/docker/docker-ce/archive/v$version/$name-ce-v$version.tar.gz \
     http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \
     http://jaeger.morpheus.net/linux/crux/files/libnetwork-7b2b1fe.tar.xz \
     $name.rc $name.conf)
 
 build() {
-    export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT=89658be
+    export GOPATH=$SRC
+    export DOCKER_GITCOMMIT=afdb6d4
     export DOCKER_BUILDTAGS='seccomp'
-    cd moby-$version
+    export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+    mkdir -p src/github.com/docker
+
+    pushd src/github.com/docker
+    ln -s $SRC/$name-ce-$version/components/cli
+    pushd cli
+    make dynbinary
+    popd
+    popd
+
+    pushd src/github.com/docker
+    ln -s $SRC/$name-ce-$version/components/engine $name
+    pushd $name
     hack/make.sh dynbinary
+    popd
+    popd
 
-    install -D -m 0755 bundles/$version/dynbinary-client/$name-$version \
-        $PKG/usr/bin/$name
-    install -D -m 0755 bundles/$version/dynbinary-daemon/dockerd-$version \
+    cd $name-ce-$version
+    install -D -m 0755 components/cli/build/$name $PKG/usr/bin/$name
+    install -D -m 0755 components/engine/bundles/$version/dynbinary-daemon/dockerd-$version \
         $PKG/usr/bin/dockerd
 
     (cd ..; \
@@ -42,10 +57,10 @@ build() {
     ln -s ctr $PKG/usr/bin/docker-containerd-ctr
     ln -s runc $PKG/usr/bin/docker-runc
 
-    install -D -m 0755 contrib/check-config.sh \
+    install -D -m 0755 components/engine/contrib/check-config.sh \
         $PKG/usr/share/$name/check-config.sh
-    install -D -m 0644 contrib/udev/80-$name.rules \
+    install -D -m 0644 components/engine/contrib/udev/80-$name.rules \
         $PKG/etc/udev/rules.d/80-$name.rules
-    install -D -m 0644 contrib/completion/bash/docker \
+    install -D -m 0644 components/cli/contrib/completion/bash/docker \
         $PKG/etc/bash_completion.d/docker
 }