[arch-commits] Commit in docker/trunk (PKGBUILD docker.service)

[Sébastien Luttringer]

    Date: Sunday, August 24, 2014 @ 00:56:07
  Author: seblu
Revision: 117822

upgpkg: docker 1:1.2.0-1

- fix FS#41440

Modified:
  docker/trunk/PKGBUILD
Deleted:
  docker/trunk/docker.service

----------------+
 PKGBUILD       |   15 ++++++---------
 docker.service |   13 -------------
 2 files changed, 6 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-23 16:16:56 UTC (rev 117821)
+++ PKGBUILD	2014-08-23 22:56:07 UTC (rev 117822)
@@ -2,8 +2,8 @@
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -16,10 +16,8 @@
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
 install=$pkgname.install
-source=("git+https://github.com/docker/docker.git#tag=v$pkgver"
-        'docker.service')
-md5sums=('SKIP'
-         'aea0c57d458e3fc313107a76745c96bb')
+source=("git+https://github.com/docker/docker.git#tag=v$pkgver")
+md5sums=('SKIP')
 
 build() {
   cd docker
@@ -41,10 +39,9 @@
   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"
   # systemd
-  #install -Dm644 'contrib/init/systemd/socket-activation/docker.service' \
-  install -Dm644 "$srcdir/docker.service" \
+  install -Dm644 'contrib/init/systemd/docker.service' \
     "$pkgdir/usr/lib/systemd/system/docker.service"
-  install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \
+  install -Dm644 'contrib/init/systemd/docker.socket' \
     "$pkgdir/usr/lib/systemd/system/docker.socket"
   # vim syntax
   install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \

Deleted: docker.service
===================================================================
--- docker.service	2014-08-23 16:16:56 UTC (rev 117821)
+++ docker.service	2014-08-23 22:56:07 UTC (rev 117822)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=http://docs.docker.com
-After=network.target docker.socket
-Requires=docker.socket
-
-[Service]
-ExecStart=/usr/bin/docker -d -H fd://
-LimitNOFILE=1048576
-LimitNPROC=1048576
-
-[Install]
-Also=docker.socket