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

[Sébastien Luttringer]

    Date: Saturday, July 26, 2014 @ 17:08:42
  Author: seblu
Revision: 116378

upgpkg: docker 1:1.1.2-2

- fix FS#41338
- remove no more needed transition message

Added:
  docker/trunk/docker.service
Modified:
  docker/trunk/PKGBUILD
  docker/trunk/docker.install

----------------+
 PKGBUILD       |   11 +++++++----
 docker.install |   11 -----------
 docker.service |   13 +++++++++++++
 3 files changed, 20 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-26 14:48:46 UTC (rev 116377)
+++ PKGBUILD	2014-07-26 15:08:42 UTC (rev 116378)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -16,8 +16,10 @@
 # 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")
-md5sums=('SKIP')
+source=("git+https://github.com/docker/docker.git#tag=v$pkgver"
+        'docker.service')
+md5sums=('SKIP'
+         'aea0c57d458e3fc313107a76745c96bb')
 
 build() {
   cd docker
@@ -39,7 +41,8 @@
   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 'contrib/init/systemd/socket-activation/docker.service' \
+  install -Dm644 "$srcdir/docker.service" \
     "$pkgdir/usr/lib/systemd/system/docker.service"
   install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \
     "$pkgdir/usr/lib/systemd/system/docker.socket"

Modified: docker.install
===================================================================
--- docker.install	2014-07-26 14:48:46 UTC (rev 116377)
+++ docker.install	2014-07-26 15:08:42 UTC (rev 116378)
@@ -8,7 +8,6 @@
 # arg 2:  the old package version
 post_upgrade() {
   (( $(vercmp $2 '1:0.7.1-1') < 0 )) &&  post_install "$1" || true
-  (( $(vercmp $2 '1:1.1.1-2') < 0 )) &&  socketactivation || true
 }
 
 # arg 1:  the old package version
@@ -16,14 +15,4 @@
   groupdel docker >/dev/null 2>&1 || true
 }
 
-socketactivation() {
-  if systemctl -q is-enabled docker; then
-    cat << EOF
-The docker service switched to socket activation.
-We will enable the socket file for you. Don't need to thanks us.
-EOF
-    systemctl enable docker.socket
-  fi
-}
-
 # vim:set ts=2 sw=2 et:

Added: docker.service
===================================================================
--- docker.service	                        (rev 0)
+++ docker.service	2014-07-26 15:08:42 UTC (rev 116378)
@@ -0,0 +1,13 @@
+[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