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/etcd-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 like var-log.
This commit is contained in:
David Michael 2017-05-17 15:28:18 -07:00
parent 300d40c0fb
commit 65cfeff736
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r2.ebuild vendored
View File

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

@ -49,15 +49,15 @@ ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/certs}"
SYSTEMD_SYSTEM_DIR_SRC="${SYSTEMD_SYSTEM_DIR_SRC:-/run/systemd/system}" SYSTEMD_SYSTEM_DIR_SRC="${SYSTEMD_SYSTEM_DIR_SRC:-/run/systemd/system}"
if [[ -d "${SYSTEMD_SYSTEM_DIR_SRC}" ]]; then if [[ -d "${SYSTEMD_SYSTEM_DIR_SRC}" ]]; then
RKT_RUN_ARGS="${RKT_RUN_ARGS} \ RKT_RUN_ARGS="${RKT_RUN_ARGS} \
--mount volume=systemd-dir,target=/run/systemd/system \ --mount volume=coreos-systemd-dir,target=/run/systemd/system \
--volume systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \ --volume coreos-systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \
" "
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 @@ RKT_STAGE1_ARG="${RKT_STAGE1_ARG:---stage1-from-dir=stage1-fly.aci}"
set -x set -x
exec ${RKT} ${RKT_GLOBAL_ARGS} \ exec ${RKT} ${RKT_GLOBAL_ARGS} \
run ${RKT_RUN_ARGS} \ run ${RKT_RUN_ARGS} \
--volume data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \ --volume coreos-data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \
--volume etc-ssl-certs,kind=host,source="${ETCD_SSL_DIR}",readOnly=true \ --volume coreos-etc-ssl-certs,kind=host,source="${ETCD_SSL_DIR}",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=data-dir,target=/var/lib/etcd \ --mount volume=coreos-data-dir,target=/var/lib/etcd \
--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} \
${ETCD_IMAGE} \ ${ETCD_IMAGE} \