From 317ca1fa5a3cf379bb9b048af9dc82de8f922098 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 18 Nov 2026 19:39:28 +0000 Subject: [PATCH] Update app version [skip ci] --- apps/serverkit/1.11.10/docker-compose.yml | 2 +- apps/serverkit/1.11.40/docker-compose.yml | 2 +- apps/serverkit/1.11.41/docker-compose.yml | 2 +- apps/serverkit/1.11.43/.env.sample | 9 ++ apps/serverkit/1.11.43/data.yml | 171 +++++++++++++++++++++ apps/serverkit/1.11.43/docker-compose.yml | 40 +++++ apps/serverkit/1.11.43/scripts/init.sh | 175 ++++++++++++++++++++++ apps/serverkit/1.11.43/scripts/upgrade.sh | 85 +++++++++++ 8 files changed, 483 insertions(+), 3 deletions(-) create mode 100644 apps/serverkit/1.11.43/.env.sample create mode 100644 apps/serverkit/1.11.43/data.yml create mode 100644 apps/serverkit/1.11.43/docker-compose.yml create mode 100755 apps/serverkit/1.11.43/scripts/init.sh create mode 100755 apps/serverkit/1.11.43/scripts/upgrade.sh diff --git a/apps/serverkit/1.11.10/docker-compose.yml b/apps/serverkit/1.11.10/docker-compose.yml index e5f1e95cb..51f8af8ce 100644 --- a/apps/serverkit/1.11.10/docker-compose.yml +++ b/apps/serverkit/1.11.10/docker-compose.yml @@ -1,6 +1,6 @@ services: serverkit: - image: "jhd3197/serverkit:1.11.43" + image: "jhd3197/serverkit:1.11.27" container_name: ${CONTAINER_NAME} ports: - "${PANEL_APP_PORT_HTTP}:5000" diff --git a/apps/serverkit/1.11.40/docker-compose.yml b/apps/serverkit/1.11.40/docker-compose.yml index e5f1e95cb..29b3e8b9b 100644 --- a/apps/serverkit/1.11.40/docker-compose.yml +++ b/apps/serverkit/1.11.40/docker-compose.yml @@ -1,6 +1,6 @@ services: serverkit: - image: "jhd3197/serverkit:1.11.43" + image: "jhd3197/serverkit:1.11.40" container_name: ${CONTAINER_NAME} ports: - "${PANEL_APP_PORT_HTTP}:5000" diff --git a/apps/serverkit/1.11.41/docker-compose.yml b/apps/serverkit/1.11.41/docker-compose.yml index e5f1e95cb..e1383989c 100644 --- a/apps/serverkit/1.11.41/docker-compose.yml +++ b/apps/serverkit/1.11.41/docker-compose.yml @@ -1,6 +1,6 @@ services: serverkit: - image: "jhd3197/serverkit:1.11.43" + image: "jhd3197/serverkit:1.11.41" container_name: ${CONTAINER_NAME} ports: - "${PANEL_APP_PORT_HTTP}:5000" diff --git a/apps/serverkit/1.11.43/.env.sample b/apps/serverkit/1.11.43/.env.sample new file mode 100644 index 000000000..f06598ece --- /dev/null +++ b/apps/serverkit/1.11.43/.env.sample @@ -0,0 +1,9 @@ +CONTAINER_NAME=serverkit-compose-check +PANEL_APP_PORT_HTTP=5000 +SECRET_KEY= +JWT_SECRET_KEY= +SERVERKIT_ENCRYPTION_KEY= +CORS_ORIGINS=http://localhost +SERVERKIT_PUBLIC_URL= +TRUST_PROXY_HEADERS=false +TZ=Asia/Shanghai diff --git a/apps/serverkit/1.11.43/data.yml b/apps/serverkit/1.11.43/data.yml new file mode 100644 index 000000000..62782106d --- /dev/null +++ b/apps/serverkit/1.11.43/data.yml @@ -0,0 +1,171 @@ +additionalProperties: + formFields: + - default: 5000 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: HTTP port + labelZh: HTTP 端口 + label: + en: HTTP port + zh: HTTP 端口 + zh-hant: HTTP 埠 + ja: HTTP ポート + ko: HTTP 포트 + ru: Порт HTTP + ms: Port HTTP + pt-br: Porta HTTP + tr: HTTP bağlantı noktası + es-es: Puerto HTTP + fa: پورت HTTP + lo: ພອດ HTTP + required: true + rule: paramPort + type: number + - default: '' + edit: true + envKey: SECRET_KEY + labelEn: Flask secret key (unique hex value) + labelZh: Flask 密钥(请填写唯一的十六进制值) + label: + en: Flask secret key (unique hex value) + zh: Flask 密钥(请填写唯一的十六进制值) + zh-hant: Flask 金鑰(請填寫唯一的十六進位值) + ja: Flask シークレットキー(固有の 16 進数値) + ko: Flask 비밀 키(고유한 16진수 값) + ru: Секретный ключ Flask (уникальное шестнадцатеричное значение) + ms: Kunci rahsia Flask (nilai heks unik) + pt-br: Chave secreta do Flask (valor hexadecimal exclusivo) + tr: Flask gizli anahtarı (benzersiz onaltılık değer) + es-es: Clave secreta de Flask (valor hexadecimal único) + fa: کلید مخفی Flask (مقدار هگزادسیمال یکتا) + lo: ຄີລັບ Flask (ຄ່າເລກຖານ 16 ທີ່ບໍ່ຊ້ຳກັນ) + required: true + rule: paramComplexity + type: password + - default: '' + edit: true + envKey: JWT_SECRET_KEY + labelEn: JWT secret key (unique hex value) + labelZh: JWT 密钥(请填写唯一的十六进制值) + label: + en: JWT secret key (unique hex value) + zh: JWT 密钥(请填写唯一的十六进制值) + zh-hant: JWT 金鑰(請填寫唯一的十六進位值) + ja: JWT シークレットキー(固有の 16 進数値) + ko: JWT 비밀 키(고유한 16진수 값) + ru: Секретный ключ JWT (уникальное шестнадцатеричное значение) + ms: Kunci rahsia JWT (nilai heks unik) + pt-br: Chave secreta JWT (valor hexadecimal exclusivo) + tr: JWT gizli anahtarı (benzersiz onaltılık değer) + es-es: Clave secreta JWT (valor hexadecimal único) + fa: کلید مخفی JWT (مقدار هگزادسیمال یکتا) + lo: ຄີລັບ JWT (ຄ່າເລກຖານ 16 ທີ່ບໍ່ຊ້ຳກັນ) + required: true + rule: paramComplexity + type: password + - default: '' + edit: true + envKey: SERVERKIT_ENCRYPTION_KEY + labelEn: Fernet encryption key (44-character value ending in =) + labelZh: Fernet 加密密钥(44 位且以 = 结尾) + label: + en: Fernet encryption key (44-character value ending in =) + zh: Fernet 加密密钥(44 位且以 = 结尾) + zh-hant: Fernet 加密金鑰(44 位且以 = 結尾) + ja: Fernet 暗号化キー(= で終わる 44 文字の値) + ko: Fernet 암호화 키(=로 끝나는 44자 값) + ru: Ключ шифрования Fernet (44 символа с окончанием =) + ms: Kunci penyulitan Fernet (44 aksara dan berakhir dengan =) + pt-br: Chave de criptografia Fernet (44 caracteres terminados em =) + tr: Fernet şifreleme anahtarı (= ile biten 44 karakterlik değer) + es-es: Clave de cifrado Fernet (valor de 44 caracteres terminado en =) + fa: کلید رمزنگاری Fernet (مقدار ۴۴ کاراکتری که با = تمام می‌شود) + lo: ຄີເຂົ້າລະຫັດ Fernet (ຄ່າ 44 ຕົວອັກສອນທີ່ລົງທ້າຍດ້ວຍ =) + required: true + type: password + - default: http://localhost + edit: true + envKey: CORS_ORIGINS + labelEn: Allowed browser origins (comma-separated) + labelZh: 允许的浏览器来源(多个来源用逗号分隔) + label: + en: Allowed browser origins (comma-separated) + zh: 允许的浏览器来源(多个来源用逗号分隔) + zh-hant: 允許的瀏覽器來源(多個來源以逗號分隔) + ja: 許可するブラウザーオリジン(カンマ区切り) + ko: 허용된 브라우저 오리진(쉼표로 구분) + ru: Разрешённые источники браузера (через запятую) + ms: Asal pelayar yang dibenarkan (dipisahkan koma) + pt-br: Origens de navegador permitidas (separadas por vírgula) + tr: İzin verilen tarayıcı kaynakları (virgülle ayrılmış) + es-es: Orígenes de navegador permitidos (separados por comas) + fa: مبدأهای مجاز مرورگر (با ویرگول جدا شوند) + lo: ແຫຼ່ງທີ່ມາຂອງບຣາວເຊີທີ່ອະນຸຍາດ (ຄັ່ນດ້ວຍຈຸນ) + required: true + type: text + - default: '' + edit: true + envKey: SERVERKIT_PUBLIC_URL + labelEn: Public URL (optional, for reverse proxy and agents) + labelZh: 公网 URL(可选,用于反向代理和远程代理) + label: + en: Public URL (optional, for reverse proxy and agents) + zh: 公网 URL(可选,用于反向代理和远程代理) + zh-hant: 公開 URL(選填,用於反向代理與遠端代理) + ja: パブリック URL(任意、リバースプロキシとエージェント用) + ko: 공용 URL(선택 사항, 역방향 프록시 및 에이전트용) + ru: Публичный URL (необязательно, для обратного прокси и агентов) + ms: URL awam (pilihan, untuk proksi terbalik dan ejen) + pt-br: URL público (opcional, para proxy reverso e agentes) + tr: Genel URL (isteğe bağlı, ters proxy ve aracılar için) + es-es: URL público (opcional, para proxy inverso y agentes) + fa: نشانی عمومی (اختیاری، برای پراکسی معکوس و عامل‌ها) + lo: URL ສາທາລະນະ (ທາງເລືອກ, ສຳລັບ reverse proxy ແລະ agent) + required: false + rule: paramExtUrl + type: text + - default: 'false' + edit: true + envKey: TRUST_PROXY_HEADERS + labelEn: Trust reverse-proxy headers + labelZh: 信任反向代理请求头 + label: + en: Trust reverse-proxy headers + zh: 信任反向代理请求头 + zh-hant: 信任反向代理標頭 + ja: リバースプロキシヘッダーを信頼 + ko: 역방향 프록시 헤더 신뢰 + ru: Доверять заголовкам обратного прокси + ms: Percayai pengepala proksi terbalik + pt-br: Confiar nos cabeçalhos do proxy reverso + tr: Ters proxy başlıklarına güven + es-es: Confiar en las cabeceras del proxy inverso + fa: اعتماد به سرخط‌های پراکسی معکوس + lo: ເຊື່ອຖື header ຂອງ reverse proxy + required: true + type: select + values: + - label: Direct access + value: 'false' + - label: Behind a trusted reverse proxy + value: 'true' + - default: Asia/Shanghai + edit: true + envKey: TZ + labelEn: Timezone + labelZh: 时区 + label: + en: Timezone + zh: 时区 + zh-hant: 時區 + ja: タイムゾーン + ko: 시간대 + ru: Часовой пояс + ms: Zon waktu + pt-br: Fuso horário + tr: Saat dilimi + es-es: Zona horaria + fa: منطقه زمانی + lo: ເຂດເວລາ + required: true + type: text diff --git a/apps/serverkit/1.11.43/docker-compose.yml b/apps/serverkit/1.11.43/docker-compose.yml new file mode 100644 index 000000000..e5f1e95cb --- /dev/null +++ b/apps/serverkit/1.11.43/docker-compose.yml @@ -0,0 +1,40 @@ +services: + serverkit: + image: "jhd3197/serverkit:1.11.43" + container_name: ${CONTAINER_NAME} + ports: + - "${PANEL_APP_PORT_HTTP}:5000" + environment: + - "TZ=${TZ}" + - "DATABASE_URL=sqlite:////app/instance/serverkit.db" + - "FLASK_ENV=production" + - "SECRET_KEY=${SECRET_KEY}" + - "JWT_SECRET_KEY=${JWT_SECRET_KEY}" + - "SERVERKIT_ENCRYPTION_KEY=${SERVERKIT_ENCRYPTION_KEY}" + - "CORS_ORIGINS=${CORS_ORIGINS}" + - "SERVERKIT_PUBLIC_URL=${SERVERKIT_PUBLIC_URL:-}" + - "TRUST_PROXY_HEADERS=${TRUST_PROXY_HEADERS}" + - "TRUSTED_PROXY_HOPS=1" + - "SERVERKIT_GITHUB_REPO=jhd3197/ServerKit" + volumes: + - "./data:/app/instance" + networks: + - "1panel-network" + labels: + createdBy: "Apps" + restart: "unless-stopped" + healthcheck: + test: ["CMD-SHELL", "curl -f \"http://127.0.0.1:5000/api/v1/system/health\" || exit 1"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 40s + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "3" + +networks: + 1panel-network: + external: true diff --git a/apps/serverkit/1.11.43/scripts/init.sh b/apps/serverkit/1.11.43/scripts/init.sh new file mode 100755 index 000000000..012c44a60 --- /dev/null +++ b/apps/serverkit/1.11.43/scripts/init.sh @@ -0,0 +1,175 @@ +#!/usr/bin/env bash +set -euo pipefail +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +export PATH + +ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)" +ENV_FILE="${ENV_FILE:-$ROOT_DIR/.env}" + +read_env_value() { + local key="$1" + [[ -f "$ENV_FILE" ]] || return 0 + local value + value="$(sed -n "s/^${key}=//p" "$ENV_FILE" | tail -n 1)" + case "$value" in + \"*\") value="${value#\"}"; value="${value%\"}" ;; + \'*\') value="${value#\'}"; value="${value%\'}" ;; + esac + printf '%s\n' "$value" +} + +configured_value() { + local key="$1" + local default_value="$2" + local value + value="${!key:-}" + if [[ -z "$value" ]]; then + value="$(read_env_value "$key")" + fi + printf '%s\n' "${value:-$default_value}" +} + +resolve_app_path() { + local key="$1" + local raw="$2" + local clean candidate resolved current part + local -a parts=() + case "$raw" in + ""|/*|.|..|../*|*/../*|*/..) echo "unsafe ${key} path" >&2; return 1 ;; + esac + if [[ "$raw" =~ [[:cntrl:]] ]]; then + echo "unsafe ${key} path" >&2 + return 1 + fi + clean="${raw#./}" + [[ -n "$clean" ]] || { echo "unsafe ${key} path" >&2; return 1; } + command -v realpath >/dev/null 2>&1 || { echo "realpath is required" >&2; return 1; } + candidate="$ROOT_DIR/$clean" + resolved="$(realpath -m -- "$candidate")" || { echo "unsafe ${key} path" >&2; return 1; } + case "$resolved" in + "$ROOT_DIR"/*) ;; + *) echo "unsafe ${key} path" >&2; return 1 ;; + esac + current="$ROOT_DIR" + IFS='/' read -r -a parts <<< "$clean" + for part in "${parts[@]}"; do + [[ -z "$part" || "$part" == "." ]] && continue + current="$current/$part" + if [[ -L "$current" ]]; then + echo "unsafe ${key} path" >&2 + return 1 + fi + done + printf '%s\n' "$resolved" +} + +ensure_dir() { + local key="$1" + local raw + local path + raw="$(configured_value "$key" "$2")" + path="$(resolve_app_path "$key" "$raw")" + mkdir -p -- "$path" + [[ "$(resolve_app_path "$key" "$raw")" == "$path" ]] || { echo "unsafe ${key} path" >&2; return 1; } +} + +resolve_direct_child() { + local key="$1" + local raw="$2" + local clean path + clean="${raw#./}" + if [[ -z "$clean" || "$clean" == */* ]]; then + echo "unsafe ${key} path: lifecycle directories must be direct children of the version root" >&2 + return 1 + fi + path="$(resolve_app_path "$key" "$raw")" + [[ "$path" == "$ROOT_DIR/$clean" ]] || { echo "unsafe ${key} path" >&2; return 1; } + printf '%s\n' "$path" +} + +verify_trusted_root_chain() { + local current owner mode + [[ "$(id -u)" == "0" ]] || { echo "directory ownership initialization must run as root" >&2; return 1; } + command -v stat >/dev/null 2>&1 || { echo "stat is required" >&2; return 1; } + current="$ROOT_DIR" + while [[ "$current" != "/" ]]; do + [[ -d "$current" && ! -L "$current" ]] || { echo "unsafe version root chain: $current" >&2; return 1; } + IFS=':' read -r owner mode < <(stat -c '%u:%a' -- "$current") + if [[ "$current" == "$ROOT_DIR" ]]; then + # 1Panel local-app copies may be owned by the panel agent UID 1001. + [[ "$owner" == "0" || "$owner" == "1001" ]] || { echo "unsafe version root chain owner: $current" >&2; return 1; } + else + [[ "$owner" == "0" ]] || { echo "unsafe version root chain owner: $current" >&2; return 1; } + fi + [[ "$mode" =~ ^[0-7]{3,4}$ ]] || { echo "unsafe version root chain mode: $current" >&2; return 1; } + (( (8#$mode & 0022) == 0 )) || { echo "unsafe version root chain permissions: $current" >&2; return 1; } + current="$(dirname -- "$current")" + done +} + +declare -A OWNED_PATHS=() +declare -A OWNED_KEYS_BY_PATH=() + +register_owned_dir() { + local key="$1" + local raw="$2" + local path previous_key + path="$(resolve_direct_child "$key" "$raw")" + if [[ -n "${OWNED_KEYS_BY_PATH[$path]+x}" ]]; then + previous_key="${OWNED_KEYS_BY_PATH[$path]}" + echo "duplicate directory ownership target: $path ($previous_key and $key)" >&2 + return 1 + fi + OWNED_KEYS_BY_PATH["$path"]="$key" + OWNED_PATHS["$key"]="$path" +} + +register_configured_owned_dir() { + local key="$1" + local default_value="$2" + local raw + raw="$(configured_value "$key" "$default_value")" + register_owned_dir "$key" "$raw" +} + +register_fixed_owned_dir() { + local source="$1" + register_owned_dir "fixed directory $source" "$source" +} + +apply_owned_dir() { + local key="$1" + local uid="$2" + local gid="$3" + local mode="$4" + local path actual expected_mode + [[ -n "${OWNED_PATHS[$key]+x}" ]] || { echo "missing directory ownership preflight: $key" >&2; return 1; } + path="${OWNED_PATHS[$key]}" + verify_trusted_root_chain + if [[ -e "$path" || -L "$path" ]]; then + [[ -d "$path" && ! -L "$path" ]] || { echo "unsafe ${key} path" >&2; return 1; } + else + mkdir -- "$path" + fi + chmod "$mode" -- "$path" + [[ -d "$path" && ! -L "$path" ]] || { echo "unsafe ${key} path" >&2; return 1; } + chown --no-dereference "$uid:$gid" -- "$path" + expected_mode="${mode#0}" + actual="$(stat -c '%u:%g:%a' -- "$path")" + [[ "$actual" == "$uid:$gid:$expected_mode" ]] || { echo "${key} ownership/mode mismatch: expected ${uid}:${gid}:${expected_mode}, got ${actual}" >&2; return 1; } +} + +ensure_owned_dir() { + local key="$1" + local default_value="$2" + [[ -n "$default_value" ]] || { echo "missing directory ownership default: $key" >&2; return 1; } + apply_owned_dir "$key" "$3" "$4" "$5" +} + +ensure_fixed_owned_dir() { + local source="$1" + apply_owned_dir "fixed directory $source" "$2" "$3" "$4" +} + +register_fixed_owned_dir "./data" +ensure_fixed_owned_dir "./data" "999" "999" "0750" diff --git a/apps/serverkit/1.11.43/scripts/upgrade.sh b/apps/serverkit/1.11.43/scripts/upgrade.sh new file mode 100755 index 000000000..69623341b --- /dev/null +++ b/apps/serverkit/1.11.43/scripts/upgrade.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash +set -euo pipefail +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +export PATH + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)" +ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd -P)" +DATA_DIR="$ROOT_DIR/data" +LEGACY_VOLUME="serverkit-data" +MIGRATION_IMAGE="jhd3197/serverkit:1.11.4" + +fail() { + printf '%s\n' "$1" >&2 + exit 1 +} + +has_data_files() { + local entry + for entry in "$DATA_DIR"/* "$DATA_DIR"/.[!.]* "$DATA_DIR"/..?*; do + if [[ -e "$entry" || -L "$entry" ]]; then + return 0 + fi + done + return 1 +} + +bash "$SCRIPT_DIR/init.sh" + +if [[ -f "$DATA_DIR/serverkit.db" ]]; then + exit 0 +fi + +if has_data_files; then + fail "ServerKit data directory is non-empty but serverkit.db is missing; refusing legacy-volume migration" +fi + +command -v docker >/dev/null 2>&1 || fail "docker is required for legacy ServerKit volume migration" +if ! docker volume inspect "$LEGACY_VOLUME" >/dev/null 2>&1; then + exit 0 +fi +docker image inspect "$MIGRATION_IMAGE" >/dev/null 2>&1 || fail "migration image is unavailable: $MIGRATION_IMAGE" + +docker run --rm --network none --user 0 --entrypoint /bin/sh \ + --volume "$LEGACY_VOLUME:/legacy:ro" \ + --volume "$DATA_DIR:/target:rw" \ + "$MIGRATION_IMAGE" \ + -c ' +set -eu +stage=/target/.serverkit-data-migration +[ ! -e "$stage" ] && [ ! -L "$stage" ] || { echo "migration staging path already exists" >&2; exit 1; } +mkdir "$stage" +cleanup() { + rm -rf -- "$stage" +} +trap cleanup EXIT + +found=0 +found_db=0 +for item in /legacy/* /legacy/.[!.]* /legacy/..?*; do + [ -e "$item" ] || [ -L "$item" ] || continue + [ -f "$item" ] && [ ! -L "$item" ] || { echo "legacy volume contains an unsupported non-regular file" >&2; exit 1; } + name=${item##*/} + case "$name" in + serverkit.db|serverkit.db-wal|serverkit.db-shm) ;; + *) echo "legacy volume contains an unexpected file" >&2; exit 1 ;; + esac + cp -p -- "$item" "$stage/$name" + found=1 + [ "$name" = serverkit.db ] && found_db=1 +done + +[ "$found" = 0 ] && exit 0 +[ "$found_db" = 1 ] || { echo "legacy volume does not contain serverkit.db" >&2; exit 1; } + +for name in serverkit.db-wal serverkit.db-shm serverkit.db; do + if [ -e "$stage/$name" ]; then + [ ! -e "/target/$name" ] && [ ! -L "/target/$name" ] || { echo "target data file already exists" >&2; exit 1; } + chown 999:999 "$stage/$name" + chmod 0640 "$stage/$name" + mv -- "$stage/$name" "/target/$name" + fi +done +' + +bash "$SCRIPT_DIR/init.sh"