124 files changed
+2174
-951
No files matched your search
@@ -1,3 +1,4 @@
|
||||
/triggers/*
|
||||
/triggers
|
||||
/cron-*
|
||||
/scheduler-cron-write
|
||||
@@ -1,4 +1,4 @@
|
||||
TRIGGERS = triggers/cron-write
|
||||
TRIGGERS = triggers/scheduler-cron-write
|
||||
BUILD = triggers
|
||||
PLUGIN_NAME = scheduler-docker-local
|
||||
|
||||
|
||||
@@ -52,10 +52,11 @@ func generateCronEntries() ([]cron.TemplateCommand, error) {
|
||||
return nil
|
||||
}
|
||||
|
||||
c, err := cron.FetchCronEntries(appName)
|
||||
c, err := cron.FetchCronEntries(cron.FetchCronEntriesInput{AppName: appName})
|
||||
if err != nil {
|
||||
results <- []cron.TemplateCommand{}
|
||||
return err
|
||||
common.LogWarn(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
results <- c
|
||||
@@ -83,9 +84,10 @@ func generateCronEntries() ([]cron.TemplateCommand, error) {
|
||||
|
||||
id := base36.EncodeToStringLc([]byte(strings.Join(parts, ";;;")))
|
||||
command := cron.TemplateCommand{
|
||||
ID: id,
|
||||
Schedule: parts[0],
|
||||
AltCommand: parts[1],
|
||||
ID: id,
|
||||
Schedule: parts[0],
|
||||
AltCommand: parts[1],
|
||||
Maintenance: false,
|
||||
}
|
||||
if len(parts) == 3 {
|
||||
command.LogFile = parts[2]
|
||||
@@ -106,7 +108,7 @@ func generateCronEntries() ([]cron.TemplateCommand, error) {
|
||||
|
||||
for result := range results {
|
||||
c := result
|
||||
if len(c) > 0 {
|
||||
if len(c) > 0 && !c[0].Maintenance {
|
||||
commands = append(commands, c...)
|
||||
}
|
||||
}
|
||||
@@ -114,7 +116,12 @@ func generateCronEntries() ([]cron.TemplateCommand, error) {
|
||||
return commands, nil
|
||||
}
|
||||
|
||||
func writeCronEntries() error {
|
||||
func writeCronEntries(scheduler string) error {
|
||||
// allow empty scheduler, which means all apps (used by letsencrypt)
|
||||
if scheduler != "docker-local" && scheduler != "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
commands, err := generateCronEntries()
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
module github.com/dokku/dokku/plugins/scheduler-docker-local
|
||||
|
||||
go 1.23.0
|
||||
go 1.24.0
|
||||
|
||||
require (
|
||||
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
|
||||
|
||||
@@ -114,7 +114,7 @@ fn-scheduler-docker-local-retire-container() {
|
||||
return
|
||||
fi
|
||||
|
||||
DOKKU_DOCKER_STOP_TIMEOUT="$(config_get "$APP" DOKKU_DOCKER_STOP_TIMEOUT || true)"
|
||||
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds || true)"
|
||||
[[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
||||
|
||||
if [[ "$STATE" == "restarting" ]]; then
|
||||
|
||||
@@ -14,8 +14,6 @@ trigger-scheduler-docker-local-post-delete() {
|
||||
|
||||
# remove all application containers
|
||||
"$DOCKER_BIN" container ls --filter "label=com.dokku.app-name=${APP}" -q | xargs -n1 -I {} "$DOCKER_BIN" container rm --force {} &>/dev/null || true
|
||||
|
||||
plugn trigger cron-write
|
||||
}
|
||||
|
||||
trigger-scheduler-docker-local-post-delete "$@"
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail
|
||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||
[[ $DOKKU_TRACE ]] && set -x
|
||||
|
||||
trigger-scheduler-docker-local-post-deploy() {
|
||||
@@ -7,7 +8,8 @@ trigger-scheduler-docker-local-post-deploy() {
|
||||
declare trigger="post-deploy"
|
||||
declare APP="$1"
|
||||
|
||||
plugn trigger cron-write
|
||||
local DOKKU_SCHEDULER="$(get_app_scheduler "$APP")"
|
||||
plugn trigger scheduler-cron-write "$DOKKU_SCHEDULER" "$APP"
|
||||
}
|
||||
|
||||
trigger-scheduler-docker-local-post-deploy "$@"
|
||||
@@ -32,7 +32,7 @@ trigger-scheduler-docker-local-scheduler-deploy() {
|
||||
local oldids=$(get_app_container_ids "$APP" "$PROCESS_TYPE")
|
||||
|
||||
DOKKU_NETWORK_BIND_ALL="$(plugn trigger network-get-property "$APP" bind-all-interfaces)"
|
||||
DOKKU_DOCKER_STOP_TIMEOUT="$(config_get "$APP" DOKKU_DOCKER_STOP_TIMEOUT || true)"
|
||||
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds)"
|
||||
[[ $DOKKU_DOCKER_STOP_TIMEOUT ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
||||
|
||||
DOKKU_START_CMD="$(config_get "$APP" DOKKU_START_CMD || true)"
|
||||
|
||||
@@ -51,7 +51,7 @@ trigger-scheduler-docker-local-scheduler-run-stop() {
|
||||
|
||||
verify_app_name "$APP"
|
||||
|
||||
DOKKU_DOCKER_STOP_TIMEOUT="$(config_get "$APP" DOKKU_DOCKER_STOP_TIMEOUT || true)"
|
||||
DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds || true)"
|
||||
if [[ -n "$CONTAINER_NAME" ]]; then
|
||||
fn-scheduler-docker-local-stop-container "$CONTAINER_NAME" "$DOKKU_DOCKER_STOP_TIMEOUT"
|
||||
return $?
|
||||
|
||||
@@ -4,6 +4,12 @@ set -eo pipefail
|
||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||
|
||||
fn-stop-container() {
|
||||
declare APP="$1" CID="$2"
|
||||
"$DOCKER_BIN" container update --restart=no "$CID" &>/dev/null || true
|
||||
"$DOCKER_BIN" container stop $DOCKER_STOP_TIME_ARG "$CID" &>/dev/null || true
|
||||
}
|
||||
|
||||
trigger-scheduler-docker-local-scheduler-stop() {
|
||||
declare desc="scheduler-docker-local scheduler-stop plugin trigger"
|
||||
declare trigger="scheduler-stop"
|
||||
@@ -14,19 +20,27 @@ trigger-scheduler-docker-local-scheduler-stop() {
|
||||
fi
|
||||
|
||||
local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null)
|
||||
local DOKKU_DOCKER_STOP_TIMEOUT="$(config_get "$APP" DOKKU_DOCKER_STOP_TIMEOUT || true)"
|
||||
local DOKKU_DOCKER_STOP_TIMEOUT="$(plugn trigger ps-get-property "$APP" stop-timeout-seconds || true)"
|
||||
|
||||
[[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
||||
|
||||
if [[ -n "$DOKKU_APP_RUNNING_CONTAINER_IDS" ]]; then
|
||||
# Disable the container restart policy
|
||||
"$DOCKER_BIN" container update --restart=no $DOKKU_APP_RUNNING_CONTAINER_IDS &>/dev/null || true
|
||||
for CID in $DOKKU_APP_RUNNING_CONTAINER_IDS; do
|
||||
fn-stop-container "$APP" "$CID"
|
||||
done
|
||||
fi
|
||||
|
||||
"$DOCKER_BIN" container stop $DOCKER_STOP_TIME_ARG $DOKKU_APP_RUNNING_CONTAINER_IDS >/dev/null || true
|
||||
# Stop all other containers related to the app
|
||||
# fetch all containers with the com.dokku.app-name label
|
||||
local DOKKU_APP_CIDS="$(docker container ls -q -f label=com.dokku.app-name="$APP")"
|
||||
if [[ -n "$DOKKU_APP_CIDS" ]]; then
|
||||
for CID in $DOKKU_APP_CIDS; do
|
||||
fn-stop-container "$APP" "$CID"
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ "$REMOVE_CONTAINERS" == "true" ]]; then
|
||||
local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
|
||||
local DOKKU_APP_CIDS="$(docker ps -q -f label=com.dokku.app-name="$APP")"
|
||||
|
||||
if [[ -n "$DOKKU_APP_CIDS" ]]; then
|
||||
for CID in $DOKKU_APP_CIDS; do
|
||||
@@ -36,6 +50,8 @@ trigger-scheduler-docker-local-scheduler-stop() {
|
||||
"$DOCKER_BIN" container rm --force $DOKKU_APP_CIDS &>/dev/null || true
|
||||
fi
|
||||
fi
|
||||
|
||||
plugn trigger scheduler-cron-write "$DOKKU_SCHEDULER" "$APP"
|
||||
}
|
||||
|
||||
trigger-scheduler-docker-local-scheduler-stop "$@"
|
||||
@@ -18,8 +18,9 @@ func main() {
|
||||
|
||||
var err error
|
||||
switch trigger {
|
||||
case "cron-write":
|
||||
err = schedulerdockerlocal.TriggerCronWrite()
|
||||
case "scheduler-cron-write":
|
||||
scheduler := flag.Arg(0)
|
||||
err = schedulerdockerlocal.TriggerSchedulerCronWrite(scheduler)
|
||||
default:
|
||||
err = fmt.Errorf("Invalid plugin trigger call: %s", trigger)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package schedulerdockerlocal
|
||||
|
||||
// TriggerCronWrite force updates the cron file for all apps
|
||||
func TriggerCronWrite() error {
|
||||
return writeCronEntries()
|
||||
// TriggerSchedulerCronWrite force updates the cron file for all apps
|
||||
func TriggerSchedulerCronWrite(scheduler string) error {
|
||||
return writeCronEntries(scheduler)
|
||||
}
|
||||
Reference in new issue
Block a user