Update to latest release 18.09.0

1 files changed, 17 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 79d7452576e0..061ab9af8a2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sébastien "Seblu" Luttringer
 
 pkgname=docker-bin
-pkgver=18.06.0
+pkgver=18.09.0
 pkgrel=1
 pkgdesc='Pack, ship and run any application as a lightweight container, using official binaries'
 arch=('x86_64')
@@ -10,18 +10,19 @@ url='https://www.docker.com/'
 license=('Apache')
 provides=('docker' 'docker-ce')
 conflicts=('docker' 'docker-ce' 'docker-git')
-depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp')
-makedepends=('make' 'git' 'go')
-optdepends=('btrfs-progs: btrfs backend support')
+depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp' 'runc' 'containerd')
+makedepends=('make' 'git' 'go' 'go-md2man')
+optdepends=('btrfs-progs: btrfs backend support'
+            'pigz: parallel gzip compressor support')
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
 source=(
-  "https://download.docker.com/linux/static/edge/x86_64/docker-${pkgver}-ce.tgz"
-  "https://github.com/docker/docker-ce/archive/v${pkgver}-ce.tar.gz"
+  "https://download.docker.com/linux/static/edge/x86_64/docker-${pkgver}.tgz"
+  "https://github.com/docker/docker-ce/archive/v${pkgver}.tar.gz"
   "docker.sysusers"
 )
-md5sums=('057617a036acfbc908cb6eec6e608b7d'
-         'ffe05742cecabed9536ad5ad84e18d38'
+md5sums=('cac2990fb7eea0bff75aafda284daa01'
+         'cf7f7fd8dde4bea3798cea36e8f806a1'
          '9a8b2744db23b14ca3cd350fdf73c179')
 
 build() {
@@ -31,22 +32,18 @@ build() {
 
   # 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
+  ln -rsfT docker-ce-$pkgver/components/cli src/github.com/docker/cli
 
   msg2 'Building man pages'
   pushd src/github.com/docker/cli >/dev/null
+  # disable go-md2man compilation/install as we will use the packaged version
+  sed -i -e '/go install.*go-md2man/d' scripts/docs/generate-man.sh
   make manpages 2>/dev/null
   popd >/dev/null
 }
 
 package() {
   cd docker
-  # runc
-  install -Dm755 'docker-runc' "$pkgdir/usr/bin/docker-runc"
-  # docker-containerd
-  install -Dm755 'docker-containerd' "$pkgdir/usr/bin/docker-containerd"
-  install -Dm755 'docker-containerd-shim' "$pkgdir/usr/bin/docker-containerd-shim"
-  install -Dm755 'docker-containerd-ctr' "$pkgdir/usr/bin/docker-containerd-ctr"
   # docker-proxy
   install -Dm755 'docker-proxy' "$pkgdir/usr/bin/docker-proxy"
   # docker-init
@@ -55,7 +52,7 @@ package() {
   install -Dm755 'docker' "$pkgdir/usr/bin/docker"
   install -Dm755 'dockerd' "$pkgdir/usr/bin/dockerd"
 
-  cd $srcdir/docker-ce-$pkgver-ce/components/cli
+  cd $srcdir/docker-ce-$pkgver/components/cli
   # completion
   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"
@@ -65,19 +62,17 @@ package() {
   install -dm755 "$pkgdir/usr/share/man"
   cp -r man/man* "$pkgdir/usr/share/man"
 
-  cd $srcdir/docker-ce-$pkgver-ce/components/packaging
+  cd $srcdir/docker-ce-$pkgver/components/packaging
   # systemd
-  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 'systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
   install -Dm644 "$srcdir/docker.sysusers" "$pkgdir/usr/lib/sysusers.d/docker.conf"
 
-  cd $srcdir/docker-ce-$pkgver-ce/components/engine
+  cd $srcdir/docker-ce-$pkgver/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"
-
-  warning "Docker CE 17.12 and later won't recognize containers started with previous Docker versions. If using Live Restore, you must stop all containers before upgrading to Docker CE 17.12. If you don't, any containers started by Docker versions that predate 17.12 won't be recognized by Docker after the upgrade and will keep running, un-managed, on the system."
 }
 
 # vim:set ts=2 sw=2 et: