Optimiere docker-deploy.sh: Validierung, Lock, Symlink-Schutz, --no-cache optional

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
Jochen MehlichandClaude Sonnet 5.5 committed 2026-10-24 09:57:16 +02:00
1 parent 7738709ef8
commit 5cb8c6b67a
1 file changed
+90 -73
+90 -73
View File
@@ -1,131 +1,148 @@
#!/bin/bash #!/usr/bin/env bash
# /usr/local/bin/app-deploy.sh # /usr/local/bin/docker-deploy.sh
set -euo pipefail #
# Docker-Compose-Wrapper für Funktions-User (gedacht für Aufruf per sudo).
set -Eeuo pipefail
IFS=$'\n\t'
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
DEPLOY_SUBDIR="its-deploy" readonly SCRIPT_NAME="$(basename "$0")"
DEPLOY_GROUP="server_APPS_docker_compose" readonly DEPLOY_SUBDIR="its-deploy"
ALLOWED_ACTIONS=("build" "up" "down" "restart" "logs" "pull" "deploy") readonly DEPLOY_GROUP="server_APPS_docker_compose"
readonly ALLOWED_ACTIONS=(build up down restart logs pull deploy)
# ── Hilfsfunktionen ────────────────────────────────────────────────────────── # ── Hilfsfunktionen ──────────────────────────────────────────────────────────
log() { printf '[%(%Y-%m-%d %H:%M:%S)T] %s\n' -1 "$*"; }
die() { printf '❌ %s\n' "$*" >&2; exit 1; }
usage() { usage() {
echo "Verwendung: sudo $(basename "$0") <username> <action>" cat >&2 <<EOF
echo "" Verwendung: sudo ${SCRIPT_NAME} <username> <action> [--no-cache]
echo "Aktionen: ${ALLOWED_ACTIONS[*]}"
echo "" Aktionen: ${ALLOWED_ACTIONS[*]}
echo "Beispiel: sudo $(basename "$0") func_123 deploy" Optionen: --no-cache Build ohne Layer-Cache (nur build/deploy)
Beispiel: sudo ${SCRIPT_NAME} func_123 deploy
EOF
exit 1 exit 1
} }
is_allowed_action() { in_array() {
local value="$1" local needle="$1"; shift
for item in "${ALLOWED_ACTIONS[@]}"; do local item
[[ "$item" == "$value" ]] && return 0 for item in "$@"; do [[ "$item" == "$needle" ]] && return 0; done
done
return 1 return 1
} }
is_in_group() { user_in_group() {
local user="$1" local -a groups
local group="$2" read -ra groups <<<"$(id -nG "$1")"
id -nG "$user" 2>/dev/null | tr ' ' '\n' | grep -qx "$group" in_array "$2" "${groups[@]}"
} }
log() { on_error() {
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" local rc=$? line=$1
log "💥 Fehlgeschlagen (Exit $rc, Zeile $line): ${APP_USER:-?} ${ACTION:-?}" >&2
exit "$rc"
} }
trap 'on_error $LINENO' ERR
# ── Argument-Validierung ───────────────────────────────────────────────────── # ── Argumente ────────────────────────────────────────────────────────────────
if [[ $# -lt 2 ]]; then [[ $# -ge 2 && $# -le 3 ]] || usage
usage
fi
APP_USER="$1" APP_USER="$1"
ACTION="$2" ACTION="$2"
NO_CACHE=()
if ! id "$APP_USER" &>/dev/null; then if [[ "${3:-}" == "--no-cache" ]]; then
echo "❌ User '$APP_USER' existiert nicht auf diesem System" NO_CACHE=(--no-cache)
exit 1 elif [[ -n "${3:-}" ]]; then
usage
fi fi
if ! is_in_group "$APP_USER" "$DEPLOY_GROUP"; then # ── Validierung ──────────────────────────────────────────────────────────────
echo "❌ User '$APP_USER' ist nicht in Gruppe '$DEPLOY_GROUP'" [[ $EUID -eq 0 ]] || die "Muss als root laufen (sudo)"
exit 1 [[ "$APP_USER" =~ ^[a-z_][a-z0-9_-]{0,31}$ ]] || die "Ungültiger Username: '$APP_USER'"
id "$APP_USER" &>/dev/null || die "User '$APP_USER' existiert nicht auf diesem System"
user_in_group "$APP_USER" "$DEPLOY_GROUP" || die "User '$APP_USER' ist nicht in Gruppe '$DEPLOY_GROUP'"
in_array "$ACTION" "${ALLOWED_ACTIONS[@]}" || die "Unbekannte Aktion: '$ACTION' (erlaubt: ${ALLOWED_ACTIONS[*]})"
if [[ ${#NO_CACHE[@]} -gt 0 && "$ACTION" != "build" && "$ACTION" != "deploy" ]]; then
die "--no-cache ist nur bei build/deploy sinnvoll"
fi fi
if ! is_allowed_action "$ACTION"; then command -v docker >/dev/null || die "docker nicht gefunden"
echo "❌ Unbekannte Aktion: '$ACTION'" docker compose version &>/dev/null || die "Docker-Compose-Plugin nicht verfügbar"
echo " Erlaubt: ${ALLOWED_ACTIONS[*]}"
exit 1
fi
# ── Pfad-Auflösung ─────────────────────────────────────────────────────────── # ── Pfade ────────────────────────────────────────────────────────────────────
HOME_DIR=$(getent passwd "$APP_USER" | cut -d: -f6) HOME_DIR="$(getent passwd "$APP_USER" | cut -d: -f6)"
if [[ -z "$HOME_DIR" ]]; then [[ -n "$HOME_DIR" ]] || die "Home-Verzeichnis für '$APP_USER' nicht ermittelbar"
echo "❌ Home-Verzeichnis für '$APP_USER' nicht ermittelbar"
exit 1 # Symlink-Tricks verhindern: aufgelöster Pfad muss unter dem Home bleiben
fi APP_DIR="$(realpath -e -- "${HOME_DIR}/${DEPLOY_SUBDIR}" 2>/dev/null)" \
|| die "Verzeichnis nicht gefunden: ${HOME_DIR}/${DEPLOY_SUBDIR}"
HOME_REAL="$(realpath -e -- "$HOME_DIR")"
[[ "$APP_DIR" == "$HOME_REAL"/* ]] || die "Deploy-Verzeichnis liegt außerhalb des Home: $APP_DIR"
APP_DIR="${HOME_DIR}/${DEPLOY_SUBDIR}"
COMPOSE_FILE="${APP_DIR}/docker-compose.yml" COMPOSE_FILE="${APP_DIR}/docker-compose.yml"
COMPOSE_OVERRIDE="${APP_DIR}/docker-compose.override.yml" COMPOSE_OVERRIDE="${APP_DIR}/docker-compose.override.yml"
[[ -f "$COMPOSE_FILE" ]] || die "docker-compose.yml nicht gefunden: $COMPOSE_FILE"
if [[ ! -d "$APP_DIR" ]]; then # ── Nebenläufigkeit: pro User nur ein Lauf gleichzeitig ──────────────────────
echo "❌ Verzeichnis nicht gefunden: $APP_DIR" exec 9>"/run/lock/${SCRIPT_NAME}.${APP_USER}.lock"
exit 1 flock -n 9 || die "Für '$APP_USER' läuft bereits ein Deploy"
fi
if [[ ! -f "$COMPOSE_FILE" ]]; then # ── Compose-Setup ────────────────────────────────────────────────────────────
echo "❌ docker-compose.yml nicht gefunden: $COMPOSE_FILE" export COMPOSE_PROJECT_NAME="$APP_USER"
exit 1
fi
# ── Compose-Args aufbauen ────────────────────────────────────────────────────
COMPOSE_ARGS=(-f "$COMPOSE_FILE") COMPOSE_ARGS=(-f "$COMPOSE_FILE")
if [[ -f "$COMPOSE_OVERRIDE" ]]; then if [[ -f "$COMPOSE_OVERRIDE" ]]; then
COMPOSE_ARGS+=(-f "$COMPOSE_OVERRIDE") COMPOSE_ARGS+=(-f "$COMPOSE_OVERRIDE")
log "📎 Override wird verwendet: $COMPOSE_OVERRIDE" log "📎 Override: $COMPOSE_OVERRIDE"
fi fi
# ── Prefix setzen ──────────────────────────────────────────────────────────── compose() { docker compose "${COMPOSE_ARGS[@]}" "$@"; }
export COMPOSE_PROJECT_NAME="$APP_USER"
log "🏷️ Project-Prefix: $COMPOSE_PROJECT_NAME"
# ── Ausführung ─────────────────────────────────────────────────────────────── log "🚀 Aufrufer: ${SUDO_USER:-root} | User: $APP_USER | Projekt: $COMPOSE_PROJECT_NAME | Pfad: $APP_DIR | Aktion: $ACTION"
log "🚀 User: $APP_USER | Pfad: $APP_DIR | Aktion: $ACTION"
cd "$APP_DIR" cd "$APP_DIR"
# Fehlerhafte Compose-Dateien früh abfangen (nicht bei down/logs)
case "$ACTION" in
build|up|restart|pull|deploy)
compose config --quiet || die "Compose-Konfiguration ungültig"
;;
esac
# ── Ausführung ───────────────────────────────────────────────────────────────
case "$ACTION" in case "$ACTION" in
build) build)
log "📦 Build starten..." log "📦 Build..."
docker compose "${COMPOSE_ARGS[@]}" build --no-cache compose build "${NO_CACHE[@]}"
;; ;;
up) up)
log "▶️ Container starten..." log "▶️ Container starten..."
docker compose "${COMPOSE_ARGS[@]}" up -d compose up -d --remove-orphans
;; ;;
down) down)
log "⏹️ Container stoppen..." log "⏹️ Container stoppen..."
docker compose "${COMPOSE_ARGS[@]}" down compose down
;; ;;
restart) restart)
log "🔄 Container neu starten..." log "🔄 Container neu starten..."
docker compose "${COMPOSE_ARGS[@]}" restart compose restart
;; ;;
logs) logs)
log "📋 Logs (letzte 100 Zeilen)..." log "📋 Logs (letzte 100 Zeilen)..."
docker compose "${COMPOSE_ARGS[@]}" logs --tail=100 compose logs --tail=100
;; ;;
pull) pull)
log "⬇️ Images aktualisieren..." log "⬇️ Images aktualisieren..."
docker compose "${COMPOSE_ARGS[@]}" pull compose pull
;; ;;
deploy) deploy)
log "🚢 Full Deploy: pull → build → up..." log "🚢 Deploy: pull → build → up..."
docker compose "${COMPOSE_ARGS[@]}" pull compose pull --ignore-buildable
docker compose "${COMPOSE_ARGS[@]}" build --no-cache compose build --pull "${NO_CACHE[@]}"
docker compose "${COMPOSE_ARGS[@]}" up -d compose up -d --remove-orphans
compose ps
;; ;;
esac esac
log "✅ Fertig: $APP_USER $ACTION" log "✅ Fertig: $APP_USER $ACTION"