From deeaf6dc4181a6a0b48f63a596d298db1ad536c8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 20 Jul 2018 14:29:00 -0400 Subject: [PATCH] fix: ensure path exists --- plugins/scheduler-docker-local/install | 7 ++++--- plugins/scheduler-docker-local/internal-functions | 2 +- plugins/scheduler-docker-local/scheduler-retire | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/scheduler-docker-local/install b/plugins/scheduler-docker-local/install index faf0b5001..230cf687a 100755 --- a/plugins/scheduler-docker-local/install +++ b/plugins/scheduler-docker-local/install @@ -6,13 +6,14 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions" scheduler-docker-local-install() { declare desc="scheduler-docker-local install plugin trigger" declare trigger="scheduler-docker-local-install" + local DOKKU_PATH mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local" chown -R "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/scheduler-docker-local" fn-plugin-property-setup "scheduler-docker-local" - dokku_path="$(which dokku)" + DOKKU_PATH="$(which dokku)" if [[ $(systemctl 2> /dev/null) =~ -\.mount ]]; then cat< /etc/systemd/system/dokku-retire.service @@ -24,7 +25,7 @@ After=docker.service [Service] Type=oneshot User=$DOKKU_SYSTEM_USER -ExecStart=$dokku_path ps:restore +ExecStart=$DOKKU_PATH ps:restore [Install] WantedBy=docker.service @@ -45,7 +46,7 @@ else PATH=/usr/local/bin:/usr/bin:/bin SHELL=/bin/bash -2 * * * * $DOKKU_SYSTEM_USER $dokku_path ps:retire +2 * * * * $DOKKU_SYSTEM_USER $DOKKU_PATH ps:retire EOF fi } diff --git a/plugins/scheduler-docker-local/internal-functions b/plugins/scheduler-docker-local/internal-functions index 93654347b..338441705 100755 --- a/plugins/scheduler-docker-local/internal-functions +++ b/plugins/scheduler-docker-local/internal-functions @@ -113,7 +113,7 @@ fn-scheduler-docker-local-retire-container() { fn-scheduler-docker-local-register-retired-container() { declare APP="$1" CID="$2" WAIT="$3" - local DEAD_CONTAINER_FILE="${DOKKU_LIB_ROOT}/data/dokku-scheduler/dead-containers" + local DEAD_CONTAINER_FILE="${DOKKU_LIB_ROOT}/data/scheduler-docker-local/dead-containers" local CURRENT_TIME DEAD_TIME CURRENT_TIME="$(date +%s)" diff --git a/plugins/scheduler-docker-local/scheduler-retire b/plugins/scheduler-docker-local/scheduler-retire index 92df8797d..f0f24cd02 100755 --- a/plugins/scheduler-docker-local/scheduler-retire +++ b/plugins/scheduler-docker-local/scheduler-retire @@ -7,7 +7,7 @@ scheduler-docker-local-scheduler-retire() { declare desc="retires all old containers once they have aged out" declare trigger="scheduler-docker-local scheduler-retire" - local DEAD_CONTAINER_FILE="${DOKKU_LIB_ROOT}/data/dokku-scheduler/dead-containers" + local DEAD_CONTAINER_FILE="${DOKKU_LIB_ROOT}/data/scheduler-docker-local/dead-containers" local APP CID CURRENT_TIME DEAD_TIME DEAD_CONTAINERS=()