Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8fcedde19be9c405b3596e18c55b4b21b3e2af13
commit 8fcedde19be9c405b3596e18c55b4b21b3e2af13
Author: crazy <cr...@frugalware.org>
Date: Tue Aug 8 01:12:47 2017 +0200
docker-17.05.0-2-x86_64
* rebuild with libguestfs
* fix install script:
we used $pkgname.istall && Finclude systemd with _F_systemd_units=()
that is not going to work.. since both want a different .install file :)
* also merged systemd/docker install in docker.install and removed Finclude
systemd
since we don't enable nor start anything by default.
diff --git a/source/apps-extra/docker/FrugalBuild
b/source/apps-extra/docker/FrugalBuild
index 3b8b57c..71a0458 100644
--- a/source/apps-extra/docker/FrugalBuild
+++ b/source/apps-extra/docker/FrugalBuild
@@ -4,23 +4,19 @@
pkgname=docker
pkgver=17.05.0
_gitcommit="89658be"
-pkgrel=1
+pkgrel=2
pkgdesc="Docker - the Linux container runtime"
-archs=('!i686' 'x86_64')
+archs=('x86_64')
groups=('apps-extra')
-depends=('bridge-utils' 'iproute2' 'libguestfs' 'sqlite3' 'lvm2'
'btrfs-progs>=4.10-2')
+depends=('bridge-utils' 'iproute2' 'libguestfs>=1.36.5' 'sqlite3' 'lvm2'
'btrfs-progs>=4.10-2')
makedepends=('go>=1.7' 'git' 'mercurial' 'ca-certificates' 'sphinx-httpdomain'
'mkdocs' \
'python-jinja' 'python-markupsafe' 'python-markdown' 'pyyaml' 'watchdog'
'pathtools')
rodepends=('containerd' 'runc' 'libnetwork' 'tini')
_F_github_name="moby"
_F_github_author="moby"
_F_github_tag_v="y"
-_F_systemd_units=(docker=)
-provides=('lxc-docker')
-replaces=('lxc-docker')
-conflicts=('lxc-docker')
_F_archive_grepv="rc[1-9]"
-Finclude github systemd
+Finclude github
_F_cd_path="moby-$pkgver-ce"
up2date="$up2date | sed 's/-ce//'"
source=(${source[@]//$pkgver/$pkgver-ce} \
@@ -30,6 +26,10 @@ sha1sums=('b1294decbd28eac9df59ecea1d4dc86dcd64346f' \
'47027a4c415cb1aa556e54dd0dc1c80f4fbe076a' \
'36269e4f788302439cd6bc672a83f594348660db')
+provides=('lxc-docker')
+replaces=('lxc-docker')
+conflicts=('lxc-docker')
+
build() {
Fcd
Fpatchall
diff --git a/source/apps-extra/docker/docker.install
b/source/apps-extra/docker/docker.install
index 5ff035e..b2b672f 100644
--- a/source/apps-extra/docker/docker.install
+++ b/source/apps-extra/docker/docker.install
@@ -1,16 +1,49 @@
+systemd_units=(docker=)
+
post_install()
{
- /bin/systemd-sysusers
+ local unit
+ local op
+ local i
+
+ /bin/systemd-sysusers
+
+ for i in ${systemd_units[@]}; do
+ unit=$(echo $i | cut -f 1 -d '=')
+ op=$(echo $i | cut -f 2 -d '=')
+ if echo $op | grep -q 'e'; then
+ systemctl enable $unit.service >/dev/null 2>&1
+ fi
+ if echo $op | grep -q 's'; then
+ systemctl start $unit.service >/dev/null 2>&1
+ fi
+ done
+
}
post_upgrade()
{
- post_install()
+ /bin/systemd-sysusers
+ systemctl daemon-reload >/dev/null 2>&1
+}
+
+pre_remove()
+{
+ local unit
+ local i
+
+ for i in ${systemd_units[@]}; do
+ unit=$(echo $i | cut -f 1 -d '=')
+ systemctl --no-reload disable $unit.service >/dev/null 2>&1
+ systemctl stop $unit.service >/dev/null 2>&1
+ done
}
post_remove()
{
+ systemctl daemon-reload >/dev/null 2>&1
getent group docker 2>&1 > /dev/null && groupdel docker
+
}
op=$1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
