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

Compare commits

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

15 commits
rawhide ... f25

Author SHA1 Message Date
Adam Miller
edc5e6b88d Bump RELEASE for automatic rebuild 2017-09-21 10:31:38 -05:00
Adam Miller
43012b5e68 Bump RELEASE for automatic rebuild 2017-07-25 12:57:37 -05:00
Adam Miller
8d254efd6c Bump RELEASE for automatic rebuild 2017-07-06 14:05:20 -05:00
Adam Miller
45cbacde0c Bump RELEASE for automatic rebuild 2017-06-27 10:46:06 -05:00
Adam Miller
1187bd87a2 Bump RELEASE for automatic rebuild 2017-06-14 16:26:32 -05:00
Adam Miller
b51e7bdc31 Bump RELEASE for automatic rebuild 2017-06-08 22:22:11 -05:00
yuqi-zhang
b711d7eaa0 Update various configs 
Dockerfile:
  - update labels
  - use fqn for FROM

config.json.template:
  - update oci version
  - update capabilities for new runc version

service/run.sh
  - update to use systemd-notify
 2017-06-06 16:55:11 -04:00
Adam Miller
9ef58561a9 Bump RELEASE for automatic rebuild 2017-05-23 16:18:03 -05:00
Adam Miller
03238a41a4 Bump RELEASE for automatic rebuild 2017-04-20 21:34:16 -05:00
Adam Miller
a3b0fc721b Bump RELEASE for automatic rebuild 2017-03-29 22:39:28 -05:00
Adam Miller
21393396cf Bump RELEASE for automatic rebuild 2017-03-29 15:18:07 -05:00
Adam Miller
e7255bdcd3 Bump RELEASE for automatic rebuild 2017-03-15 17:25:07 -05:00
Adam Miller
ec89b478e9 Bump RELEASE for automatic rebuild 2017-03-15 16:50:33 -05:00
Adam Miller
97b49284bd Bump RELEASE for automatic rebuild 2017-03-02 20:22:04 -06:00
yuqi-zhang
f43c4df792 Initial import (#1421858). 2017-02-23 16:11:17 -05:00
3 changed files with 5 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -1,11 +1,12 @@
FROM registry.fedoraproject.org/fedora:rawhide
FROM registry.fedoraproject.org/fedora:25
ENV container=docker FLANNELD_ETCD_ENDPOINTS="http://127.0.0.1:2379" FLANNELD_ETCD_PREFIX="/atomic.io/network"
ENV VERSION=0 ARCH=x86_64
ENV VERSION=0.1 RELEASE=16 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>" \
@ -15,9 +16,6 @@ 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,35 +23,30 @@
"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",
@ -175,27 +170,7 @@
"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,12 +4,10 @@
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 -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 &
NOTIFY_SOCKET=/dev/null /usr/bin/flanneld &
child=$!
while test \! -e /run/flannel/subnet.env