From 0d4a6bc320ec369873dbc8efe8760c8efcd59db8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Jan 2022 04:23:53 -0500 Subject: [PATCH] fix: ensure service config files are owned by the dokku system user Refs dokku/dokku-postgres#245 --- install | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install b/install index b544b7c..ac98505 100755 --- a/install +++ b/install @@ -24,10 +24,10 @@ plugin-install() { pull-docker-image "$PLUGIN_WAIT_IMAGE" mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE data directory" - chown dokku:dokku "$PLUGIN_DATA_ROOT" + chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$PLUGIN_DATA_ROOT" mkdir -p "$PLUGIN_CONFIG_ROOT" || echo "Failed to create $PLUGIN_SERVICE config directory" - chown dokku:dokku "$PLUGIN_CONFIG_ROOT" + chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$PLUGIN_CONFIG_ROOT" rm -f "/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}*" _SUDOERS_FILE="/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}" @@ -53,11 +53,13 @@ EOL if [[ "$image" == *":"* ]]; then echo "${image%:*}" > "$SERVICE_ROOT/IMAGE" echo "${image##*:}" > "$SERVICE_ROOT/IMAGE_VERSION" + chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$SERVICE_ROOT/IMAGE" "$SERVICE_ROOT/IMAGE_VERSION" fi fi if [[ -f "$SERVICE_ROOT/${PLUGIN_VARIABLE}_CONFIG_OPTIONS" ]]; then mv "$SERVICE_ROOT/${PLUGIN_VARIABLE}_CONFIG_OPTIONS" "$SERVICE_ROOT/CONFIG_OPTIONS" + chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "$SERVICE_ROOT/CONFIG_OPTIONS" fi done }