[gentoo-commits] repo/gentoo:master commit in: app-emulation/flannel/, app-emulation/flannel/files/
commit: 40f02a0eaee5422f5eeb2b3dd7c7dd5c6b926cd5
Author: Zac Medico gentoo org>
AuthorDate: Fri Sep 1 22:22:44 2017 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Sep 1 22:29:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f02a0e
app-emulation/flannel: revbump to 0.8.0-r2 for bug 629170
Package-Manager: Portage-2.3.8, Repoman-2.3.2
app-emulation/flannel/files/flanneld.initd | 9 ++---
.../flannel/{flannel-0.8.0-r1.ebuild => flannel-0.8.0-r2.ebuild} | 0
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/app-emulation/flannel/files/flanneld.initd
b/app-emulation/flannel/files/flanneld.initd
index 6f75abd40f5..d5d966a40d3 100644
--- a/app-emulation/flannel/files/flanneld.initd
+++ b/app-emulation/flannel/files/flanneld.initd
@@ -3,11 +3,11 @@
# Distributed under the terms of the GNU General Public License v2
description="Flannel Network Fabric for Containers"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
user=${user:-root}
group=${group:-root}
-command="/usr/bin/${SVCNAME}"
+command="/usr/bin/${RC_SVCNAME}"
command_args="${command_args}"
command_background="true"
start_stop_daemon_args="--user ${user} --group ${group} \
@@ -16,9 +16,4 @@ start_stop_daemon_args="--user ${user} --group ${group} \
depend() {
need net
- after net
-}
-
-start_pre() {
- checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
}
diff --git a/app-emulation/flannel/flannel-0.8.0-r1.ebuild
b/app-emulation/flannel/flannel-0.8.0-r2.ebuild
similarity index 100%
rename from app-emulation/flannel/flannel-0.8.0-r1.ebuild
rename to app-emulation/flannel/flannel-0.8.0-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-emulation/flannel/, app-emulation/flannel/files/
commit: 588a8971fe9252f583dd0be708fdf87e5d18a8ed
Author: Manuel Rüger gentoo org>
AuthorDate: Thu Aug 3 18:49:57 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Thu Aug 3 18:49:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588a8971
app-emulation/flannel: Add initscripts and logrotate file
Package-Manager: Portage-2.3.6, Repoman-2.3.3
app-emulation/flannel/files/flanneld.confd | 2 +
app-emulation/flannel/files/flanneld.initd | 24
app-emulation/flannel/files/flanneld.logrotated | 7
app-emulation/flannel/flannel-0.8.0-r1.ebuild | 51 +
4 files changed, 84 insertions(+)
diff --git a/app-emulation/flannel/files/flanneld.confd
b/app-emulation/flannel/files/flanneld.confd
new file mode 100644
index 000..18686aa5d22
--- /dev/null
+++ b/app-emulation/flannel/files/flanneld.confd
@@ -0,0 +1,2 @@
+# arguments for flannel
+command_args=""
diff --git a/app-emulation/flannel/files/flanneld.initd
b/app-emulation/flannel/files/flanneld.initd
new file mode 100644
index 000..6f75abd40f5
--- /dev/null
+++ b/app-emulation/flannel/files/flanneld.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Flannel Network Fabric for Containers"
+pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+user=${user:-root}
+group=${group:-root}
+
+command="/usr/bin/${SVCNAME}"
+command_args="${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/flannel/flannel.log \
+ --stderr /var/log/flannel/flannel.log"
+
+depend() {
+ need net
+ after net
+}
+
+start_pre() {
+ checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
+}
diff --git a/app-emulation/flannel/files/flanneld.logrotated
b/app-emulation/flannel/files/flanneld.logrotated
new file mode 100644
index 000..4108e630557
--- /dev/null
+++ b/app-emulation/flannel/files/flanneld.logrotated
@@ -0,0 +1,7 @@
+/var/log/flannel/* {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/app-emulation/flannel/flannel-0.8.0-r1.ebuild
b/app-emulation/flannel/flannel-0.8.0-r1.ebuild
new file mode 100644
index 000..5135efe94f8
--- /dev/null
+++ b/app-emulation/flannel/flannel-0.8.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="An etcd backed network fabric for containers"
+EGO_PN="github.com/coreos/flannel"
+HOMEPAGE="https://github.com/coreos/flannel;
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
+ -i "${S}/src/${EGO_PN}/version/version.go" || die
+}
+
+src_compile() {
+ CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
+ GOPATH="${WORKDIR}/${P}" \
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+ [[ -x bin/${PN} ]] || die
+}
+
+src_test() {
+ GOPATH="${WORKDIR}/${P}" \
+ go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+ newbin "bin/${PN}" ${PN}d
+ cd "src/${EGO_PN}" || die
+ exeinto /usr/libexec/flannel
+ doexe dist/mk-docker-opts.sh
+ insinto /etc/systemd/system/docker.service.d
+ newins "${FILESDIR}/flannel-docker.conf" flannel.conf
+ newinitd "${FILESDIR}"/flanneld.initd flanneld
+ newconfd "${FILESDIR}"/flanneld.confd flanneld
+ keepdir /var/log/${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/flanneld.logrotated flanneld
+ systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
+ systemd_dounit "${FILESDIR}/flanneld.service"
+ dodoc README.md
+}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/flannel/, app-emulation/flannel/files/
commit: da8d9548289ae8466568b211517f75a95a108aed
Author: Zac Medico gentoo org>
AuthorDate: Fri Oct 23 22:24:46 2015 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Oct 23 22:28:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8d9548
app-emulation/flannel: new package, An etcd backed network fabric for containers
Package-Manager: portage-2.2.23
app-emulation/flannel/Manifest | 1 +
app-emulation/flannel/files/flannel-docker.conf | 2 ++
app-emulation/flannel/files/flannel.tmpfilesd | 1 +
app-emulation/flannel/files/flanneld.service| 13 +++
app-emulation/flannel/flannel-0.5.4.ebuild | 46 +
app-emulation/flannel/metadata.xml | 10 ++
6 files changed, 73 insertions(+)
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
new file mode 100644
index 000..21f5b5e
--- /dev/null
+++ b/app-emulation/flannel/Manifest
@@ -0,0 +1 @@
+DIST flannel-0.5.4.tar.gz 578005 SHA256
14bbbabdbb85f3366ae6788a8b8ba110d56add15e06def4d8ead4c9698fc15fd SHA512
535d3de31186760cd72cac5753fabc269c8ebf9f3fe90a381b86dae0747a1dd4f4099cce19729a7d5990fefc99236bea8742062605a376f9bd9f653c07b4e92a
WHIRLPOOL
10756f47fc35ce39ac1b9321d4bb347993d8d5dd37bc83bf769e35e32f3de02bbba89d39142c4b6eb8a6bd92be7a5ad91c45bf0f8aeb6e0efe050383766c3aef
diff --git a/app-emulation/flannel/files/flannel-docker.conf
b/app-emulation/flannel/files/flannel-docker.conf
new file mode 100644
index 000..8f55177
--- /dev/null
+++ b/app-emulation/flannel/files/flannel-docker.conf
@@ -0,0 +1,2 @@
+[Service]
+EnvironmentFile=-/run/flannel/docker
diff --git a/app-emulation/flannel/files/flannel.tmpfilesd
b/app-emulation/flannel/files/flannel.tmpfilesd
new file mode 100644
index 000..98e5abd
--- /dev/null
+++ b/app-emulation/flannel/files/flannel.tmpfilesd
@@ -0,0 +1 @@
+d /run/flannel 0755 root root
diff --git a/app-emulation/flannel/files/flanneld.service
b/app-emulation/flannel/files/flanneld.service
new file mode 100644
index 000..7e59b6b
--- /dev/null
+++ b/app-emulation/flannel/files/flanneld.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Flanneld overlay address etcd agent
+After=network.target
+Before=docker.service
+
+[Service]
+Type=notify
+Environment=FLANNEL_ETCD=http://127.0.0.1:4001
FLANNEL_ETCD_KEY=/coreos.com/network
+ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD}
-etcd-prefix=${FLANNEL_ETCD_KEY} $FLANNEL_OPTIONS
+ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS
-d /run/flannel/docker
+
+[Install]
+RequiredBy=docker.service
diff --git a/app-emulation/flannel/flannel-0.5.4.ebuild
b/app-emulation/flannel/flannel-0.5.4.ebuild
new file mode 100644
index 000..4b3992c
--- /dev/null
+++ b/app-emulation/flannel/flannel-0.5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="An etcd backed network fabric for containers"
+GO_PN="github.com/coreos/flannel"
+HOMEPAGE="https://${GO_PN};
+SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+src_prepare() {
+ local line
+ sed -e 's:go build:[[ ${0##*/} == test ]] || \0 -v -x:' -i build || die
+ sed -e 's:go test:\0 -v:' -i test || die
+
+ # remote_test.go:98: GetNetworkConfig failed: Get
http://127.0.0.1:/v1/_/config: dial tcp 127.0.0.1:: getsockopt:
connection refused
+ sed -e 's:^func TestRemote:func _TestRemote:' -i remote/remote_test.go
|| die
+}
+
+src_compile() {
+ "${BASH}" -ex ./build || die 'Build failed'
+}
+
+src_test() {
+ "${BASH}" -ex ./test || die 'Tests failed'
+}
+
+src_install() {
+ dobin bin/*
+ exeinto /usr/libexec/flannel
+ doexe dist/mk-docker-opts.sh
+ insinto /etc/systemd/system/docker.service.d
+ newins "${FILESDIR}/flannel-docker.conf" flannel.conf
+ systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
+ systemd_dounit "${FILESDIR}/flanneld.service"
+}
diff --git a/app-emulation/flannel/metadata.xml
b/app-emulation/flannel/metadata.xml
new file mode 100644
index 000..bd78c24
--- /dev/null
+++ b/app-emulation/flannel/metadata.xml
@@ -0,0 +1,10 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+zmed...@gentoo.org
+
+
+coreos/flannel
+
+
