Update to latest stable release 17.06.0

4 files changed, 48 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e36918f36e8..1d9c57812697 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = docker-stable-bin
 	pkgdesc = Pack, ship and run any application as a lightweight container, using official binaries
-	pkgver = 17.03.1
-	pkgrel = 2
+	pkgver = 17.06.0
+	pkgrel = 1
 	url = https://www.docker.com/
-	install = docker-stable-bin.install
 	arch = x86_64
 	license = Apache
-	makedepends = go-md2man
+	makedepends = make
+	makedepends = git
+	makedepends = go
 	depends = bridge-utils
 	depends = iproute2
 	depends = device-mapper
@@ -23,12 +24,12 @@ pkgbase = docker-stable-bin
 	conflicts = docker-ce
 	conflicts = docker-git
 	options = !strip
-	source = https://get.docker.com/builds/Linux/x86_64/docker-17.03.1-ce.tgz
-	source = https://github.com/moby/moby/archive/v17.03.1-ce.tar.gz
+	source = https://download.docker.com/linux/static/stable/x86_64/docker-17.06.0-ce.tgz
+	source = https://github.com/docker/docker-ce/archive/v17.06.0-ce.tar.gz
 	source = docker.sysusers
-	md5sums = c815623b6f2f9fab21c1c9a471b3c6df
-	md5sums = e9692eaf80c78fcc860643e3468c6c76
-	md5sums = 8cf9900ebada61f352a03465a088da34
+	md5sums = ecc2f2d99b64b35d8ad478eafcc6f502
+	md5sums = 1eb7761b77dc328e6b0a9c481bcd7514
+	md5sums = 9a8b2744db23b14ca3cd350fdf73c179
 
 pkgname = docker-stable-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d5bdfa00bee..191e428206ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Sébastien "Seblu" Luttringer
 
 pkgname=docker-stable-bin
-pkgver=17.03.1
-pkgrel=2
+pkgver=17.06.0
+pkgrel=1
 pkgdesc='Pack, ship and run any application as a lightweight container, using official binaries'
 arch=('x86_64')
 url='https://www.docker.com/'
@@ -12,23 +12,33 @@ provides=('docker' 'docker-bin' 'docker-ce')
 conflicts=('docker' 'docker-bin' 'docker-ce' 'docker-git')
 depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp')
 makedepends=('go-md2man')
+makedepends=('make' 'git' 'go')
 optdepends=('btrfs-progs: btrfs backend support'
             'lxc: lxc backend support')
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
-install=$pkgname.install
 source=(
-  "https://get.docker.com/builds/Linux/x86_64/docker-${pkgver}-ce.tgz"
-  "https://github.com/moby/moby/archive/v${pkgver}-ce.tar.gz"
-  "docker.sysusers")
-md5sums=('c815623b6f2f9fab21c1c9a471b3c6df'
-         'e9692eaf80c78fcc860643e3468c6c76'
-         '8cf9900ebada61f352a03465a088da34')
+  "https://download.docker.com/linux/static/stable/x86_64/docker-${pkgver}-ce.tgz"
+  "https://github.com/docker/docker-ce/archive/v${pkgver}-ce.tar.gz"
+  "docker.sysusers"
+)
+md5sums=('ecc2f2d99b64b35d8ad478eafcc6f502'
+         '1eb7761b77dc328e6b0a9c481bcd7514'
+         '9a8b2744db23b14ca3cd350fdf73c179')
 
 build() {
-  cd moby-$pkgver-ce
-  # man pages
-  man/md2man-all.sh 2>/dev/null
+  ### go magics
+  export GOPATH="$srcdir"
+  export PATH="$GOPATH/bin:$PATH"
+
+  # mock go packages so we can generate the man pages
+  mkdir -p src/github.com/docker
+  ln -rsfT docker-ce-$pkgver-ce/components/cli src/github.com/docker/cli
+
+  msg2 'Building man pages'
+  pushd src/github.com/docker/cli >/dev/null
+  make manpages 2>/dev/null
+  popd >/dev/null
 }
 
 package() {
@@ -46,23 +56,28 @@ package() {
   # docker binary
   install -Dm755 'docker' "$pkgdir/usr/bin/docker"
   install -Dm755 'dockerd' "$pkgdir/usr/bin/dockerd"
+
+  cd $srcdir/docker-ce-$pkgver-ce/components/cli
   # completion
-  install -Dm644 'completion/bash/docker' "$pkgdir/usr/share/bash-completion/completions/docker"
-  install -Dm644 'completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker"
-  install -Dm644 'completion/fish/docker.fish' "$pkgdir/usr/share/fish/vendor_completions.d/docker.fish"
+  install -Dm644 'contrib/completion/bash/docker' "$pkgdir/usr/share/bash-completion/completions/docker"
+  install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker"
+  install -Dm644 'contrib/completion/fish/docker.fish' "$pkgdir/usr/share/fish/vendor_completions.d/docker.fish"
+
+  # man
+  install -dm755 "$pkgdir/usr/share/man"
+  cp -r man/man* "$pkgdir/usr/share/man"
 
-  cd ../moby-$pkgver-ce
+  cd $srcdir/docker-ce-$pkgver-ce/components/packaging
   # systemd
-  install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
-  install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket"
-  install -Dm644 'contrib/udev/80-docker.rules' "$pkgdir/usr/lib/udev/rules.d/80-docker.rules"
+  install -Dm644 'deb/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
+  install -Dm644 'deb/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket"
   install -Dm644 "$srcdir/docker.sysusers" "$pkgdir/usr/lib/sysusers.d/docker.conf"
+
+  cd $srcdir/docker-ce-$pkgver-ce/components/engine
+  install -Dm644 'contrib/udev/80-docker.rules' "$pkgdir/usr/lib/udev/rules.d/80-docker.rules"
   # vim syntax
   install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim"
   install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim"
-  # man
-  install -dm755 "$pkgdir/usr/share/man"
-  mv man/man* "$pkgdir/usr/share/man"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/docker-stable-bin.install b/docker-stable-bin.install
deleted file mode 100644
index 75a8cfb5afb1..000000000000
--- a/docker-stable-bin.install
+++ /dev/null
@@ -1,13 +0,0 @@
-# Arg 1:  the new package version
-post_install() {
-  # create docker group (FS#38029)
-  systemd-sysusers docker.conf
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  (( $(vercmp $2 '1:0.7.1-1') < 0 )) &&  post_install "$1" || true
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/docker.sysusers b/docker.sysusers
index 0f62654dc78f..a69c8f68cf47 100644
--- a/docker.sysusers
+++ b/docker.sysusers
@@ -1 +1,2 @@
+# create docker group (FS#38029)
 g docker - -