mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 06:21:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1078 from eyakubovich/master

Browse Source 
flannel: make use of mk-docker-opts.sh
This commit is contained in:
Eugene Yakubovich 2015-01-30 17:39:01 -08:00
commit b309f3e786
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service vendored
View File

@ -25,11 +25,6 @@ ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true
# Update docker options # Update docker options
ExecStartPost=/bin/bash -c ' \ ExecStartPost=/usr/bin/docker run --net=host --rm -v /run:/run \
touch /run/docker_opts.env; \ quay.io/coreos/flannel:${FLANNEL_VER} \
source /run/docker_opts.env; \ /opt/bin/mk-docker-opts.sh -d /run/flannel_docker_opts.env -i
source /run/flannel/subnet.env; \
DOCKER_OPTS+="--ip-masq=false " \
DOCKER_OPTS+=$(test -n "$FLANNEL_SUBNET" && echo "--bip=$FLANNEL_SUBNET "); \
DOCKER_OPTS+=$(test -n "$FLANNEL_MTU" && echo "--mtu=$FLANNEL_MTU "); \
echo "DOCKER_OPTS=\\"$DOCKER_OPTS\\"" >/run/docker_opts.env'

0
sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.2.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.2.1.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service vendored
View File

@ -6,10 +6,10 @@ Requires=docker.socket early-docker.target
[Service] [Service]
Environment=TMPDIR=/var/tmp Environment=TMPDIR=/var/tmp
EnvironmentFile=-/run/docker_opts.env EnvironmentFile=-/run/flannel_docker_opts.env
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
ExecStart=/usr/lib/coreos/dockerd --daemon --host=fd:// $DOCKER_OPTS ExecStart=/usr/lib/coreos/dockerd --daemon --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target