diff --git a/chronograf/1.10/alpine/entrypoint.sh b/chronograf/1.10/alpine/entrypoint.sh index bb8d32b50..3c4869166 100755 --- a/chronograf/1.10/alpine/entrypoint.sh +++ b/chronograf/1.10/alpine/entrypoint.sh @@ -9,8 +9,17 @@ if [ "$1" = 'chronograf' ]; then export BOLT_PATH=${BOLT_PATH:-/var/lib/chronograf/chronograf-v1.db} fi -if [ "$(id -u)" -ne 0 ] || [ "${CHRONOGRAF_AS_ROOT}" = "true" ]; then - exec "$@" -else +if [ $(id -u) -eq 0 ] ; then + if [ "${CHRONOGRAF_AS_ROOT}" != "true" ] ; then + chown -Rc chronograf:chronograf /var/lib/chronograf exec su-exec chronograf "$@" + fi + chown -Rc root:root /var/lib/chronograf +else + if [ ! -w /var/lib/chronograf ] ; then + echo "You need to change ownership on chronograf's persistent store. Run:" + echo " sudo chown -R $(id -u):$(id -u) /path/to/persistent/store" + fi fi + +exec "$@" diff --git a/chronograf/1.10/entrypoint.sh b/chronograf/1.10/entrypoint.sh index 8a68b024f..a77de93dc 100755 --- a/chronograf/1.10/entrypoint.sh +++ b/chronograf/1.10/entrypoint.sh @@ -9,8 +9,17 @@ if [ "$1" = 'chronograf' ]; then export BOLT_PATH=${BOLT_PATH:-/var/lib/chronograf/chronograf-v1.db} fi -if [ "$(id -u)" -ne 0 ] || [ "${CHRONOGRAF_AS_ROOT}" = "true" ]; then - exec "$@" -else +if [ $(id -u) -eq 0 ] ; then + if [ "${CHRONOGRAF_AS_ROOT}" != "true" ] ; then + chown -Rc chronograf:chronograf /var/lib/chronograf exec setpriv --reuid chronograf --regid chronograf --init-groups "$@" + fi + chown -Rc root:root /var/lib/chronograf +else + if [ ! -w /var/lib/chronograf ] ; then + echo "You need to change ownership on chronograf's persistent store. Run:" + echo " sudo chown -R $(id -u):$(id -u) /path/to/persistent/store" + fi fi + +exec "$@"