Merge pull request #7208 from dokku/7010-docker-container-healthchecker-path
Compute path for docker-container-healthchecker
This commit is contained in:
2 files changed
+7
-2
No files matched your search
@@ -153,7 +153,10 @@ trigger-scheduler-docker-local-check-deploy() {
|
|||||||
echo "$content" >"$TMP_APP_JSON_OUTPUT"
|
echo "$content" >"$TMP_APP_JSON_OUTPUT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo /usr/bin/docker-container-healthchecker check "$DOKKU_APP_CONTAINER_ID" "${ARG_ARRAY[@]}" || FAILEDCHECKS="$?"
|
local docker_container_healthchecker_path
|
||||||
|
docker_container_healthchecker_path="$(command -v docker-container-healthchecker)"
|
||||||
|
|
||||||
|
sudo "$docker_container_healthchecker_path" check "$DOKKU_APP_CONTAINER_ID" "${ARG_ARRAY[@]}" || FAILEDCHECKS="$?"
|
||||||
|
|
||||||
if [[ $FAILEDCHECKS -gt 0 ]]; then
|
if [[ $FAILEDCHECKS -gt 0 ]]; then
|
||||||
"$DOCKER_BIN" container update --restart=no "$DOKKU_APP_CONTAINER_ID" &>/dev/null || true
|
"$DOCKER_BIN" container update --restart=no "$DOKKU_APP_CONTAINER_ID" &>/dev/null || true
|
||||||
|
|||||||
@@ -16,7 +16,9 @@ trigger-scheduler-docker-local-install() {
|
|||||||
|
|
||||||
rm -f "/etc/sudoers.d/dokku-cron"
|
rm -f "/etc/sudoers.d/dokku-cron"
|
||||||
|
|
||||||
echo "%dokku ALL=(ALL) NOPASSWD:/usr/bin/docker-container-healthchecker" >"/etc/sudoers.d/dokku-docker-container-healthchecker"
|
local docker_container_healthchecker_path
|
||||||
|
docker_container_healthchecker_path="$(command -v docker-container-healthchecker)"
|
||||||
|
echo "%dokku ALL=(ALL) NOPASSWD:$docker_container_healthchecker_path" >"/etc/sudoers.d/dokku-docker-container-healthchecker"
|
||||||
chmod "0440" "/etc/sudoers.d/dokku-docker-container-healthchecker"
|
chmod "0440" "/etc/sudoers.d/dokku-docker-container-healthchecker"
|
||||||
|
|
||||||
DOKKU_PATH="$(command -v dokku)"
|
DOKKU_PATH="$(command -v dokku)"
|
||||||
|
|||||||
Reference in new issue
Block a user