container/flannel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: container:f25
Branches Tags
container:rawhide
container:f30
container:main
container:f29
container:f28
container:f27
container:f26
container:f25
..
compare: container:rawhide
Branches Tags
container:f30
container:main
container:rawhide
container:f29
container:f28
container:f27
container:f26
container:f25

3 commits
f25 ... rawhide

Author SHA1 Message Date
Clement Verna
3cede38182 Drop Release label in favor of OSBS release_bump plugin. 
OSBS can automatically bump the release number, for that
we just need to drop the label from the Dockerfile

See https://pagure.io/ContainerSIG/container-sig/issue/1

Signed-off-by: Clement Verna <cverna@tutanota.com>
 2018-08-20 19:31:12 +02:00
yuqi-zhang
b73797c19f Update master to upstream 
Signed-off-by: Yu Qi Zhang <jzehrarnyg@gmail.com>
 2017-09-06 15:21:04 -04:00
yuqi-zhang
b01c536ca3 Initial import (#1421858). 2017-03-08 15:56:50 -05:00
3 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -1,12 +1,11 @@
FROM registry.fedoraproject.org/fedora:25
FROM registry.fedoraproject.org/fedora:rawhide
ENV container=docker FLANNELD_ETCD_ENDPOINTS="http://127.0.0.1:2379" FLANNELD_ETCD_PREFIX="/atomic.io/network"
ENV VERSION=0.1 RELEASE=16 ARCH=x86_64
ENV VERSION=0 ARCH=x86_64
LABEL com.redhat.component="flannel" \
name="$FGC/flannel" \
version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \
summary="An etcd driven address agent, intended to be run as a system container" \
maintainer="Giuseppe Scrivano <gscrivan@redhat.com>" \
@ -16,6 +15,9 @@ RUN dnf -y --setopt=tsflags=nodocs install flannel && dnf clean all
ADD flanneld-run.sh /usr/bin/
RUN mkdir -p /exports/hostfs/etc/sysconfig/ && cp /etc/sysconfig/flanneld /exports/hostfs/etc/sysconfig/
RUN mkdir -p /exports/hostfs/etc/flanneld
# System container files
COPY tmpfiles.template service.template manifest.json \
config.json.template /exports/

27
config.json.template
View file

@ -23,30 +23,35 @@
"cwd": "/",
"capabilities": {
"bounding": [
"CAP_DAC_READ_SEARCH",
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE",
"CAP_NET_ADMIN"
],
"permitted": [
"CAP_DAC_READ_SEARCH",
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE",
"CAP_NET_ADMIN"
],
"inheritable": [
"CAP_DAC_READ_SEARCH",
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE",
"CAP_NET_ADMIN"
],
"effective": [
"CAP_DAC_READ_SEARCH",
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE",
"CAP_NET_ADMIN"
],
"ambient": [
"CAP_DAC_READ_SEARCH",
"CAP_AUDIT_WRITE",
"CAP_KILL",
"CAP_NET_BIND_SERVICE",
@ -170,7 +175,27 @@
"rbind",
"rprivate"
]
}
},
{
"source": "/etc/sysconfig/flanneld",
"destination": "/etc/sysconfig/flanneld",
"type": "bind",
"options": [
"rw",
"rbind",
"rprivate"
]
},
{
"source": "/etc/flanneld",
"destination": "/etc/flanneld",
"type": "bind",
"options": [
"rw",
"rbind",
"rprivate"
]
}
],
"hooks": {},
"linux": {

4
flanneld-run.sh
View file

@ -4,10 +4,12 @@
echo "[Service]" > /etc/systemd/system/docker.service.d/$NAME.conf
echo "EnvironmentFile=-/run/$NAME/docker" >> /etc/systemd/system/docker.service.d/$NAME.conf
source /etc/sysconfig/flanneld
# Ensure this file doesn't already exist.
rm -f run/flannel/subnet.env
NOTIFY_SOCKET=/dev/null /usr/bin/flanneld &
NOTIFY_SOCKET=/dev/null /usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD_ENDPOINTS} -etcd-prefix=${FLANNEL_ETCD_PREFIX} -etcd-cafile=${FLANNEL_ETCD_CAFILE} -etcd-certfile=${FLANNEL_ETCD_CERTFILE} -etcd-keyfile=${FLANNEL_ETCD_KEYFILE} $FLANNEL_OPTIONS &
child=$!
while test \! -e /run/flannel/subnet.env