diff options
Diffstat (limited to 'community/docker')
| -rw-r--r-- | community/docker/PKGBUILD | 17 | ||||
| -rw-r--r-- | community/docker/docker.install | 11 |
2 files changed, 22 insertions, 6 deletions
diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD index fb8df0247..aeca2bfde 100644 --- a/community/docker/PKGBUILD +++ b/community/docker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115778 2014-07-16 13:54:27Z seblu $ +# $Id: PKGBUILD 116315 2014-07-24 22:59:14Z seblu $ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' @@ -16,7 +16,7 @@ optdepends=('btrfs-progs: btrfs backend support' # don't strip binaries! A sha1 is used to check binary consistency. options=('!strip') install=$pkgname.install -source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver") +source=("git+https://github.com/docker/docker.git#tag=v$pkgver") md5sums=('SKIP') build() { @@ -39,10 +39,15 @@ package() { 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/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service" + install -Dm644 'contrib/init/systemd/socket-activation/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" # 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/dockerfile.vim" + 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" } # vim:set ts=2 sw=2 et: diff --git a/community/docker/docker.install b/community/docker/docker.install index f730503de..f75fd94aa 100644 --- a/community/docker/docker.install +++ b/community/docker/docker.install @@ -8,6 +8,7 @@ post_install() { # 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 @@ -15,4 +16,14 @@ post_remove() { 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: |