[arch-commits] Commit in docker/trunk (PKGBUILD docker.install docker.sysusers)
Sébastien Luttringer
seblu at archlinux.org
Fri May 8 10:35:33 UTC 2015
Date: Friday, May 8, 2015 @ 12:35:33
Author: seblu
Revision: 132956
upgpkg: docker 1:1.6.1-1
Added:
docker/trunk/docker.sysusers
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.install
-----------------+
PKGBUILD | 21 ++++++++++-----------
docker.install | 9 ++-------
docker.sysusers | 1 +
3 files changed, 13 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-08 10:27:12 UTC (rev 132955)
+++ PKGBUILD 2015-05-08 10:35:33 UTC (rev 132956)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -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"
+ "$pkgname.sysusers")
+md5sums=('SKIP'
+ '4324edeb9adc210a2c22f44eb4cb8a74')
build() {
cd docker
@@ -40,15 +42,12 @@
install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker"
install -Dm644 'contrib/completion/fish/docker.fish' "$pkgdir/usr/share/fish/completions/docker.fish"
# systemd
- install -Dm644 'contrib/init/systemd/docker.service' \
- "$pkgdir/usr/lib/systemd/system/docker.service"
- install -Dm644 'contrib/init/systemd/docker.socket' \
- "$pkgdir/usr/lib/systemd/system/docker.socket"
+ install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
+ install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket"
+ install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
# 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"
+ 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:
Modified: docker.install
===================================================================
--- docker.install 2015-05-08 10:27:12 UTC (rev 132955)
+++ docker.install 2015-05-08 10:35:33 UTC (rev 132956)
@@ -1,7 +1,7 @@
-# arg 1: the new package version
+# Arg 1: the new package version
post_install() {
# create docker group (FS#38029)
- getent group docker >/dev/null || groupadd -g 142 docker
+ systemd-sysusers docker.conf
}
# arg 1: the new package version
@@ -10,9 +10,4 @@
(( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true
}
-# arg 1: the old package version
-post_remove() {
- groupdel docker >/dev/null 2>&1 || true
-}
-
# vim:set ts=2 sw=2 et:
Added: docker.sysusers
===================================================================
--- docker.sysusers (rev 0)
+++ docker.sysusers 2015-05-08 10:35:33 UTC (rev 132956)
@@ -0,0 +1 @@
+g docker 2 -
More information about the arch-commits
mailing list