@@ -30,6 +30,7 @@ fn-help-content() {
|
||||
run [-e|--env KEY=VALUE] [--no-tty] <app> <cmd>, Run a command in a new container using the current app image
|
||||
run:detached [-e|-env KEY=VALUE] [--no-tty] <app> <cmd>, Run a command in a new detached container using the current app image
|
||||
run:list [--format json|stdout] <app>, List all run containers for an app
|
||||
run:logs <app|--container CONTAINER> [-h] [-t] [-n num] [-q], Display recent log output for run containers
|
||||
run:stop <app|--container CONTAINER>, Stops all run containers for an app or a specified run container
|
||||
help_content
|
||||
}
|
||||
|
||||
@@ -110,6 +110,71 @@ cmd-run-list() {
|
||||
plugn trigger scheduler-run-list "$DOKKU_SCHEDULER" "$APP" "$FORMAT"
|
||||
}
|
||||
|
||||
cmd-run-logs() {
|
||||
declare desc="display recent log output"
|
||||
declare cmd="run:logs"
|
||||
[[ "$1" == "$cmd" ]] && shift 1
|
||||
declare APP=""
|
||||
|
||||
local CONTAINER_NAME="" NUM="100" PRETTY_PRINT=false TAIL=false
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--container=*)
|
||||
local arg=$(printf "%s" "$1" | sed -E 's/(^--container=)//g')
|
||||
CONTAINER_NAME="$arg"
|
||||
shift
|
||||
;;
|
||||
--container)
|
||||
if [[ ! $2 ]]; then
|
||||
dokku_log_warn "expected $1 to have an argument"
|
||||
break
|
||||
fi
|
||||
CONTAINER_NAME="$2"
|
||||
shift 2
|
||||
;;
|
||||
-n | --num)
|
||||
local NUM="$2"
|
||||
shift 2
|
||||
;;
|
||||
-q | --quiet)
|
||||
local PRETTY_PRINT=true
|
||||
shift
|
||||
;;
|
||||
-t | --tail)
|
||||
local TAIL=true
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
APP="$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -z "$APP" ]] && [[ -z "$CONTAINER_NAME" ]]; then
|
||||
dokku_log_fail "No container or app specified"
|
||||
fi
|
||||
|
||||
if [[ -n "$CONTAINER_NAME" ]]; then
|
||||
if [[ "$(echo "$CONTAINER_NAME" | grep -o '\.' | wc -l)" -ne 2 ]]; then
|
||||
dokku_log_fail "Invalid container name specified: $CONTAINER_NAME"
|
||||
fi
|
||||
|
||||
if [[ -n "$APP" ]] && [[ "$APP" != "$(echo "$CONTAINER_NAME" | cut -d'.' -f1)" ]]; then
|
||||
dokku_log_fail "Specified app does not app in container name"
|
||||
fi
|
||||
|
||||
APP="$(echo "$CONTAINER_NAME" | cut -d'.' -f1)"
|
||||
if [[ "$(echo "$CONTAINER_NAME" | cut -d'.' -f2)" != "run" ]]; then
|
||||
dokku_log_fail "Specified container must be a run container"
|
||||
fi
|
||||
fi
|
||||
|
||||
verify_app_name "$APP"
|
||||
DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
|
||||
plugn trigger scheduler-run-logs "$DOKKU_SCHEDULER" "$APP" "$CONTAINER_NAME" "$TAIL" "$PRETTY_PRINT" "$NUM"
|
||||
}
|
||||
|
||||
cmd-run-stop() {
|
||||
declare desc="Stops all run containers for an app or a specified run container"
|
||||
declare cmd="run:stop"
|
||||
|
||||
6
plugins/run/subcommands/logs
Executable file
6
plugins/run/subcommands/logs
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail
|
||||
source "$PLUGIN_AVAILABLE_PATH/run/internal-functions"
|
||||
[[ $DOKKU_TRACE ]] && set -x
|
||||
|
||||
cmd-run-logs "$@"
|
||||
53
plugins/scheduler-docker-local/scheduler-run-logs
Executable file
53
plugins/scheduler-docker-local/scheduler-run-logs
Executable file
@@ -0,0 +1,53 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail
|
||||
[[ $DOKKU_TRACE ]] && set -x
|
||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||
|
||||
trigger-scheduler-docker-local-scheduler-logs() {
|
||||
declare desc="scheduler-docker-local scheduler-logs plugin trigger"
|
||||
declare trigger="scheduler-logs"
|
||||
declare DOKKU_SCHEDULER="$1" APP="$2" CONTAINER_NAME="$3" TAIL="$4" PRETTY_PRINT="$5" NUM="$6"
|
||||
local DOKKU_LOGS_ARGS=""
|
||||
|
||||
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ "$TAIL" == "true" ]]; then
|
||||
DOKKU_LOGS_ARGS="--follow "
|
||||
fi
|
||||
|
||||
local COLORS=(36 33 32 35 31)
|
||||
|
||||
if [[ -n "$CONTAINER_NAME" ]]; then
|
||||
local CONTAINERS=("$CONTAINER_NAME")
|
||||
else
|
||||
local CONTAINERS=()
|
||||
NAMES="$("$DOCKER_BIN" container ls --all --filter "label=com.dokku.app-name=$APP" --filter "label=com.dokku.container-type=run" --format '{{ .Names }}')"
|
||||
while IFS= read -r CONTAINER_NAME; do
|
||||
CONTAINERS+=("$CONTAINER_NAME")
|
||||
done <<< "$NAMES"
|
||||
fi
|
||||
|
||||
local DOKKU_LOGS_ARGS+="--tail $NUM"
|
||||
((MAX_INDEX = ${#CONTAINERS[*]} - 1)) || true
|
||||
for i in ${!CONTAINERS[*]}; do
|
||||
local DYNO="$(echo "${CONTAINERS[i]}" | cut -d. -f3)"
|
||||
local CID="${CONTAINERS[i]}"
|
||||
local COLOR=${COLORS[i % ${#COLORS[*]}]}
|
||||
if [[ $PRETTY_PRINT == "true" ]]; then
|
||||
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs $DOKKU_LOGS_ARGS $CID 2>&1)"
|
||||
else
|
||||
local DOKKU_LOGS_PRETTY_PRINT_CMD="sed -r 's/^([^Z]+Z )/\x1b[${COLOR}m\1app[$DYNO]:\x1b[0m /gm'"
|
||||
local DOKKU_LOGS_CMD+="($DOCKER_BIN logs -t $DOKKU_LOGS_ARGS $CID 2>&1 | $DOKKU_LOGS_PRETTY_PRINT_CMD)"
|
||||
fi
|
||||
if [[ $i != "$MAX_INDEX" ]]; then
|
||||
local DOKKU_LOGS_CMD+="& "
|
||||
else
|
||||
local DOKKU_LOGS_CMD+="; "
|
||||
fi
|
||||
done
|
||||
bash -c "($DOKKU_LOGS_CMD)"
|
||||
}
|
||||
|
||||
trigger-scheduler-docker-local-scheduler-logs "$@"
|
||||
Reference in New Issue
Block a user