From 65cfeff736618a12b0d914453a12a4c019fc114b Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 17 May 2017 15:28:18 -0700 Subject: [PATCH] app-admin/etcd-wrapper: vendor-prefix rkt volume names Since rkt 1.26.0, duplicate volume names are invalid. This avoids clashing with common user volume names like var-log. --- ...r1.ebuild => etcd-wrapper-3.1.6-r2.ebuild} | 0 .../app-admin/etcd-wrapper/files/etcd-wrapper | 28 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/{etcd-wrapper-3.1.6-r1.ebuild => etcd-wrapper-3.1.6-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper index 2299773578..022bc5dd65 100755 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper @@ -49,15 +49,15 @@ ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/certs}" SYSTEMD_SYSTEM_DIR_SRC="${SYSTEMD_SYSTEM_DIR_SRC:-/run/systemd/system}" if [[ -d "${SYSTEMD_SYSTEM_DIR_SRC}" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} \ - --mount volume=systemd-dir,target=/run/systemd/system \ - --volume systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \ + --mount volume=coreos-systemd-dir,target=/run/systemd/system \ + --volume coreos-systemd-dir,kind=host,source=${SYSTEMD_SYSTEM_DIR_SRC},readOnly=true \ " fi if [[ -S "${NOTIFY_SOCKET}" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} \ - --mount volume=notify,target=/run/systemd/notify \ - --volume notify,kind=host,source=${NOTIFY_SOCKET} \ + --mount volume=coreos-notify,target=/run/systemd/notify \ + --volume coreos-notify,kind=host,source=${NOTIFY_SOCKET} \ --set-env=NOTIFY_SOCKET=/run/systemd/notify \ " fi @@ -67,16 +67,16 @@ RKT_STAGE1_ARG="${RKT_STAGE1_ARG:---stage1-from-dir=stage1-fly.aci}" set -x exec ${RKT} ${RKT_GLOBAL_ARGS} \ run ${RKT_RUN_ARGS} \ - --volume data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \ - --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 etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ - --volume etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ - --mount volume=data-dir,target=/var/lib/etcd \ - --mount volume=etc-ssl-certs,target=/etc/ssl/certs \ - --mount volume=usr-share-certs,target=/usr/share/ca-certificates \ - --mount volume=etc-hosts,target=/etc/hosts \ - --mount volume=etc-resolv,target=/etc/resolv.conf \ + --volume coreos-data-dir,kind=host,source="${etcd_data_dir}",readOnly=false \ + --volume coreos-etc-ssl-certs,kind=host,source="${ETCD_SSL_DIR}",readOnly=true \ + --volume coreos-usr-share-certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \ + --volume coreos-etc-hosts,kind=host,source=/etc/hosts,readOnly=true \ + --volume coreos-etc-resolv,kind=host,source=/etc/resolv.conf,readOnly=true \ + --mount volume=coreos-data-dir,target=/var/lib/etcd \ + --mount volume=coreos-etc-ssl-certs,target=/etc/ssl/certs \ + --mount volume=coreos-usr-share-certs,target=/usr/share/ca-certificates \ + --mount volume=coreos-etc-hosts,target=/etc/hosts \ + --mount volume=coreos-etc-resolv,target=/etc/resolv.conf \ --inherit-env \ ${RKT_STAGE1_ARG} \ ${ETCD_IMAGE} \