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

Merge pull request #2295 from crawford/etcd

Browse Source 
app-admin/etcd-wrapper: set data dir properly
This commit is contained in:
Alex Crawford 2016-11-30 14:38:26 -08:00 committed by GitHub
commit adb81d378f
2 changed files with 6 additions and 1 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-0.0.3.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-0.0.4.ebuild vendored
View File

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

@ -39,6 +39,11 @@ if [[ ! -e "${ETCD_DATA_DIR}" ]]; then
chown "${ETCD_USER}" "${ETCD_DATA_DIR}" chown "${ETCD_USER}" "${ETCD_DATA_DIR}"
fi fi
# Do not pass ETCD_DATA_DIR through to the container. The default path,
# /var/lib/etcd is always used inside the container.
etcd_data_dir="${ETCD_DATA_DIR}"
ETCD_DATA_DIR="/var/lib/etcd"
ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/certs}" 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}"
@ -62,7 +67,7 @@ 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 data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \
--volume etc-ssl-certs,kind=host,source="${ETCD_SSL_DIR}",readOnly=true \ --volume 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 usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
--volume etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ --volume etc-hosts,kind=host,source=/etc/hosts,readOnly=true \