Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36d071b08f683a828e5c61722787fc51f4dc4264
commit 36d071b08f683a828e5c61722787fc51f4dc4264 Author: DeX77 <[email protected]> Date: Tue Jan 31 12:21:23 2017 +0100 docker-1.13.0-4-x86_64 * fixes for startup diff --git a/source/apps-extra/docker/FrugalBuild b/source/apps-extra/docker/FrugalBuild index aea12c3..356b03b 100644 --- a/source/apps-extra/docker/FrugalBuild +++ b/source/apps-extra/docker/FrugalBuild @@ -4,13 +4,14 @@ pkgname=docker pkgver=1.13.0 pkgextraver="49bf474" -pkgrel=3 +pkgrel=4 pkgdesc="Docker - the Linux container runtime" archs=('!i686' 'x86_64') groups=('apps-extra') depends=('bridge-utils' 'iproute2' 'libguestfs' 'sqlite3' 'lvm2' 'btrfs-progs>=4.8.1-2') makedepends=('go>=1.7' 'git' 'mercurial' 'ca-certificates' 'sphinx-httpdomain' 'mkdocs' \ 'python-jinja' 'python-markupsafe' 'python-markdown' 'pyyaml' 'watchdog' 'pathtools') +rodepends=('containerd' 'runc') _F_github_name="docker" _F_github_author="docker" _F_github_tag_v="y" @@ -22,9 +23,11 @@ _F_archive_grepv="rc[1-9]" Finclude github systemd _F_cd_path="$pkgname-$pkgver" source=(${source[@]} \ - _docker) + _docker \ + docker.conf) sha1sums=('c5db88d13e8cb092fe2af37ec7422bd4a2c54c04' \ - '47027a4c415cb1aa556e54dd0dc1c80f4fbe076a') + '47027a4c415cb1aa556e54dd0dc1c80f4fbe076a' \ + '36269e4f788302439cd6bc672a83f594348660db') build() { Fcd @@ -45,18 +48,23 @@ build() { Fexe gopath/src/github.com/docker/docker/bundles/${pkgver}/dynbinary-client/docker-${pkgver} \ - usr/sbin/docker + usr/bin/docker Fexe gopath/src/github.com/docker/docker/bundles/${pkgver}/dynbinary-daemon/dockerd-${pkgver} \ - usr/sbin/dockerd + usr/bin/dockerd # install systemd service unit Finstall 644 gopath/src/github.com/docker/docker/contrib/init/systemd/docker.service lib/systemd/system/docker.service + Finstall 644 gopath/src/github.com/docker/docker/contrib/init/systemd/docker.socket lib/systemd/system/docker.socket Finstall 644 gopath/src/github.com/docker/docker/contrib/completion/bash/docker \ usr/share/bash-completion/completions/docker Fmkdir usr/share/doc/docker-${pkgver} + # Create group using sysuser.d + Fmkdir usr/lib/sysusers.d/ + Ffile /usr/lib/sysusers.d/$pkgname.conf + } # optimization OK diff --git a/source/apps-extra/docker/docker.conf b/source/apps-extra/docker/docker.conf new file mode 100644 index 0000000..df3435f --- /dev/null +++ b/source/apps-extra/docker/docker.conf @@ -0,0 +1 @@ +g docker - - \ No newline at end of file diff --git a/source/apps-extra/docker/docker.install b/source/apps-extra/docker/docker.install new file mode 100644 index 0000000..5ff035e --- /dev/null +++ b/source/apps-extra/docker/docker.install @@ -0,0 +1,18 @@ +post_install() +{ + /bin/systemd-sysusers +} + +post_upgrade() +{ + post_install() +} + +post_remove() +{ + getent group docker 2>&1 > /dev/null && groupdel docker +} + +op=$1 +shift +$op $* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
