github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: use the properties system instead of the data dir for tracking whether a proxy should be stopped or started

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2022-11-22 23:29:34 -05:00
parent 6fed37b408
commit 5fed0c45ac
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/caddy-vhosts/command-functions
View File

@@ -131,8 +131,7 @@ cmd-caddy-start() {
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
touch "${DOKKU_LIB_ROOT}/data/caddy/caddy.started"
rm -f "${DOKKU_LIB_ROOT}/data/caddy/caddy.stopped"
fn-plugin-property-write "caddy" "--global" "proxy-status" "started"
fn-caddy-template-compose-file "$TMP_COMPOSE_FILE"
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p caddy up -d --quiet-pull
}
@@ -149,8 +148,7 @@ cmd-caddy-stop() {
local TMP_COMPOSE_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
trap "rm -rf '$TMP_COMPOSE_FILE' >/dev/null" RETURN INT TERM EXIT
rm -f "${DOKKU_LIB_ROOT}/data/caddy/caddy.started"
touch "${DOKKU_LIB_ROOT}/data/caddy/caddy.stopped"
fn-plugin-property-write "caddy" "--global" "proxy-status" "stopped"
fn-caddy-template-compose-file "$TMP_COMPOSE_FILE"
"$DOCKER_BIN" compose -f "$TMP_COMPOSE_FILE" -p caddy down --remove-orphans
}