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

Merge pull request #963 from eyakubovich/master

Browse Source 
app-emulation/docker,app-admin/flannel: fix flags
This commit is contained in:
Eugene Yakubovich 2014-11-18 10:02:16 -08:00
commit 8c8d4f4d38
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ ExecStartPost=/bin/bash -c ' \
touch /run/docker_opts.env; \ touch /run/docker_opts.env; \
source /run/docker_opts.env; \ source /run/docker_opts.env; \
source /run/flannel/subnet.env; \ source /run/flannel/subnet.env; \
DOCKER_OPTS+=--ip-masq=false \ DOCKER_OPTS+="--ip-masq=false " \
DOCKER_OPTS+=$(test -n "$FLANNEL_SUBNET" && echo "--bip=$FLANNEL_SUBNET "); \ DOCKER_OPTS+=$(test -n "$FLANNEL_SUBNET" && echo "--bip=$FLANNEL_SUBNET "); \
DOCKER_OPTS+=$(test -n "$FLANNEL_MTU" && echo "--mtu=$FLANNEL_MTU "); \ DOCKER_OPTS+=$(test -n "$FLANNEL_MTU" && echo "--mtu=$FLANNEL_MTU "); \
echo "DOCKER_OPTS=\\"$DOCKER_OPTS\\"" >/run/docker_opts.env' echo "DOCKER_OPTS=\\"$DOCKER_OPTS\\"" >/run/docker_opts.env'

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

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.0-r2.ebuild vendored
View File

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

@ -11,7 +11,7 @@ LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
# Run docker but don't have docker automatically restart # Run docker but don't have docker automatically restart
# containers. This is a job for systemd and unit files. # containers. This is a job for systemd and unit files.
ExecStart=/usr/bin/docker --daemon --storage-driver=btrfs --host=fd:// --bridge=none --iptables=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid ExecStart=/usr/bin/docker --daemon --storage-driver=btrfs --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid
[Install] [Install]
WantedBy=early-docker.target WantedBy=early-docker.target