Merge pull request #2198 from mischief/flannel-hosts

app-admin/flannel: mount /etc/hosts ro into flannel container
This commit is contained in:
Nick Owens 2016-09-23 13:33:36 -07:00 committed by GitHub
commit c8b1f0096f
2 changed files with 3 additions and 0 deletions

View File

@ -29,11 +29,13 @@ ExecStart=/usr/bin/rkt run --net=host \
--volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \ --volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \
--volume certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ --volume certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
--volume resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ --volume resolv,kind=host,source=/etc/resolv.conf,readOnly=true \
--volume hosts,kind=host,source=/etc/hosts,readOnly=true \
--mount volume=runsystemd,target=/run/systemd \ --mount volume=runsystemd,target=/run/systemd \
--mount volume=runflannel,target=/run/flannel \ --mount volume=runflannel,target=/run/flannel \
--mount volume=ssl,target=${ETCD_SSL_DIR} \ --mount volume=ssl,target=${ETCD_SSL_DIR} \
--mount volume=certs,target=/etc/ssl/certs \ --mount volume=certs,target=/etc/ssl/certs \
--mount volume=resolv,target=/etc/resolv.conf \ --mount volume=resolv,target=/etc/resolv.conf \
--mount volume=hosts,target=/etc/hosts \
${FLANNEL_IMG}:${FLANNEL_VER} \ ${FLANNEL_IMG}:${FLANNEL_VER} \
--exec /opt/bin/flanneld \ --exec /opt/bin/flanneld \
-- --ip-masq=true -- --ip-masq=true

View File

@ -0,0 +1 @@
flannel-9999.ebuild