diff options
Diffstat (limited to 'community/docker')
| -rw-r--r-- | community/docker/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/docker/docker.install | 11 | ||||
| -rw-r--r-- | community/docker/docker.service | 13 |
3 files changed, 21 insertions, 16 deletions
diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD index aeca2bfde..edab3533a 100644 --- a/community/docker/PKGBUILD +++ b/community/docker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 116315 2014-07-24 22:59:14Z seblu $ +# $Id: PKGBUILD 116379 2014-07-26 15:08:54Z seblu $ # Maintainer: Sébastien "Seblu" Luttringer 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 @@ 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/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 @@ 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/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" diff --git a/community/docker/docker.install b/community/docker/docker.install index f75fd94aa..f730503de 100644 --- a/community/docker/docker.install +++ b/community/docker/docker.install @@ -8,7 +8,6 @@ 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 @@ -16,14 +15,4 @@ 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: diff --git a/community/docker/docker.service b/community/docker/docker.service new file mode 100644 index 000000000..0cb31e32c --- /dev/null +++ b/community/docker/docker.service @@ -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 |