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

app-admin/flannel-wrapper: vendor-prefix rkt volume names

Browse Source 
Since rkt 1.26.0, duplicate volume names are invalid.  This avoids
clashing with common user volume names.
This commit is contained in:
David Michael 2017-05-17 15:30:22 -07:00
parent 65cfeff736
commit 48ff7259e5
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper vendored
View File

@ -46,15 +46,15 @@ fi
ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/etcd}" ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/etcd}"
if [[ -d "${ETCD_SSL_DIR}" ]]; then if [[ -d "${ETCD_SSL_DIR}" ]]; then
RKT_RUN_ARGS="${RKT_RUN_ARGS} \ RKT_RUN_ARGS="${RKT_RUN_ARGS} \
--volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \ --volume coreos-ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \
--mount volume=ssl,target=${ETCD_SSL_DIR} \ --mount volume=coreos-ssl,target=${ETCD_SSL_DIR} \
" "
fi fi
if [[ -S "${NOTIFY_SOCKET}" ]]; then if [[ -S "${NOTIFY_SOCKET}" ]]; then
RKT_RUN_ARGS="${RKT_RUN_ARGS} \ RKT_RUN_ARGS="${RKT_RUN_ARGS} \
--mount volume=notify,target=/run/systemd/notify \ --mount volume=coreos-notify,target=/run/systemd/notify \
--volume notify,kind=host,source=${NOTIFY_SOCKET} \ --volume coreos-notify,kind=host,source=${NOTIFY_SOCKET} \
--set-env=NOTIFY_SOCKET=/run/systemd/notify \ --set-env=NOTIFY_SOCKET=/run/systemd/notify \
" "
fi fi
@ -67,16 +67,16 @@ set -x
exec ${RKT} ${RKT_GLOBAL_ARGS} \ exec ${RKT} ${RKT_GLOBAL_ARGS} \
run ${RKT_RUN_ARGS} \ run ${RKT_RUN_ARGS} \
--net=host \ --net=host \
--volume run-flannel,kind=host,source=/run/flannel,readOnly=false \ --volume coreos-run-flannel,kind=host,source=/run/flannel,readOnly=false \
--volume etc-ssl-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ --volume coreos-etc-ssl-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
--volume usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ --volume coreos-usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
--volume etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ --volume coreos-etc-hosts,kind=host,source=/etc/hosts,readOnly=true \
--volume etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ --volume coreos-etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \
--mount volume=run-flannel,target=/run/flannel \ --mount volume=coreos-run-flannel,target=/run/flannel \
--mount volume=etc-ssl-certs,target=/etc/ssl/certs \ --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \
--mount volume=usr-share-certs,target=/usr/share/ca-certificates \ --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \
--mount volume=etc-hosts,target=/etc/hosts \ --mount volume=coreos-etc-hosts,target=/etc/hosts \
--mount volume=etc-resolv,target=/etc/resolv.conf \ --mount volume=coreos-etc-resolv,target=/etc/resolv.conf \
--inherit-env \ --inherit-env \
${RKT_STAGE1_ARG} \ ${RKT_STAGE1_ARG} \
${FLANNEL_IMAGE} \ ${FLANNEL_IMAGE} \

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