Skip to content

Commit af600aa

Browse files
committed
fix: ensure we can chown the directory
1 parent 3cfef56 commit af600aa

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

functions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ service_create_container() {
6969
[[ -f "$SERVICE_ROOT/IMAGE_VERSION" ]] && PLUGIN_IMAGE_VERSION="$(cat "$SERVICE_ROOT/IMAGE_VERSION")"
7070

7171
if [[ ! -f "$SERVICE_ROOT/$PLUGIN_CONFIG_SUFFIX/pushpin.conf" ]]; then
72+
mkdir -p "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX"
73+
sudo chown -R 1001:1001 "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX"
7274
"$DOCKER_BIN" container create --label dokku=service.tmp --name "tmp.$SERVICE_NAME" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
7375
"$DOCKER_BIN" container cp "tmp.$SERVICE_NAME:/etc/pushpin/pushpin.conf" "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX/pushpin.conf" 2>/dev/null
7476
"$DOCKER_BIN" container cp "tmp.$SERVICE_NAME:/etc/pushpin/routes" "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX/routes" 2>/dev/null
7577
docker rm "tmp.$SERVICE_NAME" >/dev/null 2>&1 || true
7678
fi
7779

78-
chown -R 1001:1001 "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX"
79-
8080
if [[ -f "$SERVICE_ROOT/CONFIG_OPTIONS" ]]; then
8181
export CONFIG_OPTIONS="$(cat "$SERVICE_ROOT/CONFIG_OPTIONS")"
8282
fi

install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ plugin-install() {
4242
%dokku ALL=(ALL) NOPASSWD:/bin/mv ${PLUGIN_DATA_ROOT}/.TMP_CRON_FILE /etc/cron.d/dokku-${PLUGIN_COMMAND_PREFIX}-*
4343
%dokku ALL=(ALL) NOPASSWD:/bin/chown 8983 $PLUGIN_DATA_ROOT/*
4444
%dokku ALL=(ALL) NOPASSWD:/bin/chgrp 8983 $PLUGIN_DATA_ROOT/*
45+
%dokku ALL=(ALL) NOPASSWD:/bin/chown -R 1001:1001 $PLUGIN_DATA_HOST_ROOT/*
4546
EOL
4647

4748
chmod 0440 "$_SUDOERS_FILE"

0 commit comments

Comments
 (0)