fix: ensure path exists

This commit is contained in:
Jose Diaz-Gonzalez committed 2018-10-21 12:50:39 -04:00
1 parent 8a9c77a061
commit deeaf6dc41
3 files changed
+6 -5

No files matched your search

+4 -3
View File
@@ -6,13 +6,14 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
scheduler-docker-local-install() { scheduler-docker-local-install() {
declare desc="scheduler-docker-local install plugin trigger" declare desc="scheduler-docker-local install plugin trigger"
declare trigger="scheduler-docker-local-install" declare trigger="scheduler-docker-local-install"
local DOKKU_PATH
mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local" mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local"
chown -R "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${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" fn-plugin-property-setup "scheduler-docker-local"
dokku_path="$(which dokku)" DOKKU_PATH="$(which dokku)"
if [[ $(systemctl 2> /dev/null) =~ -\.mount ]]; then if [[ $(systemctl 2> /dev/null) =~ -\.mount ]]; then
cat<<EOF > /etc/systemd/system/dokku-retire.service cat<<EOF > /etc/systemd/system/dokku-retire.service
@@ -24,7 +25,7 @@ After=docker.service
[Service] [Service]
Type=oneshot Type=oneshot
User=$DOKKU_SYSTEM_USER User=$DOKKU_SYSTEM_USER
ExecStart=$dokku_path ps:restore ExecStart=$DOKKU_PATH ps:restore
[Install] [Install]
WantedBy=docker.service WantedBy=docker.service
@@ -45,7 +46,7 @@ else
PATH=/usr/local/bin:/usr/bin:/bin PATH=/usr/local/bin:/usr/bin:/bin
SHELL=/bin/bash SHELL=/bin/bash
2 * * * * $DOKKU_SYSTEM_USER $dokku_path ps:retire 2 * * * * $DOKKU_SYSTEM_USER $DOKKU_PATH ps:retire
EOF EOF
fi fi
} }
@@ -113,7 +113,7 @@ fn-scheduler-docker-local-retire-container() {
fn-scheduler-docker-local-register-retired-container() { fn-scheduler-docker-local-register-retired-container() {
declare APP="$1" CID="$2" WAIT="$3" 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 local CURRENT_TIME DEAD_TIME
CURRENT_TIME="$(date +%s)" CURRENT_TIME="$(date +%s)"
@@ -7,7 +7,7 @@ scheduler-docker-local-scheduler-retire() {
declare desc="retires all old containers once they have aged out" declare desc="retires all old containers once they have aged out"
declare trigger="scheduler-docker-local scheduler-retire" 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 local APP CID CURRENT_TIME DEAD_TIME
DEAD_CONTAINERS=() DEAD_CONTAINERS=()