mirror of
https://github.com/okxlin/appstore.git
synced 2026-11-22 00:00:30 +00:00
Update linuxserver/kimai Docker tag to v2.72.1 (#9297)
* Update linuxserver/kimai Docker tag to v2.72.1 * Update app version [skip ci] --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: github-action update-app-version <githubaction@githubaction.com>
This commit is contained in:
co-authored by
github-action update-app-version
parent
7bbf6254f1
commit
ee2dc81dd4
@@ -0,0 +1,10 @@
|
||||
CONTAINER_NAME=
|
||||
PANEL_APP_PORT_HTTP=80
|
||||
PANEL_APP_PORT_HTTPS=443
|
||||
CONFIG_PATH=./data/config
|
||||
DB_PASSWORD=kimai-change-me
|
||||
APP_SECRET=
|
||||
DB_DATA_PATH=./data/db
|
||||
TIME_ZONE=Asia/Shanghai
|
||||
TRUSTED_HOSTS=.*
|
||||
TRUSTED_PROXIES=127.0.0.1/32
|
||||
@@ -0,0 +1,151 @@
|
||||
additionalProperties:
|
||||
formFields:
|
||||
- default: 80
|
||||
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
|
||||
required: true
|
||||
type: number
|
||||
rule: paramPort
|
||||
- default: 443
|
||||
edit: true
|
||||
envKey: PANEL_APP_PORT_HTTPS
|
||||
labelEn: HTTPS Port
|
||||
labelZh: HTTPS 端口
|
||||
label:
|
||||
en: HTTPS Port
|
||||
zh: HTTPS 端口
|
||||
zh-Hant: HTTPS 連接埠
|
||||
ja: HTTPS ポート
|
||||
ko: HTTPS 포트
|
||||
ru: HTTPS-порт
|
||||
ms: Port HTTPS
|
||||
pt-br: Porta HTTPS
|
||||
required: true
|
||||
type: number
|
||||
rule: paramPort
|
||||
- default: ./data/config
|
||||
edit: true
|
||||
envKey: CONFIG_PATH
|
||||
labelEn: Config folder path
|
||||
labelZh: 配置文件路径
|
||||
label:
|
||||
en: Config folder path
|
||||
zh: 配置文件路径
|
||||
zh-Hant: 設定檔資料夾路徑
|
||||
ja: 設定フォルダーのパス
|
||||
ko: 설정 폴더 경로
|
||||
ru: Путь к папке конфигурации
|
||||
ms: Laluan folder konfigurasi
|
||||
pt-br: Caminho da pasta de configuração
|
||||
required: true
|
||||
type: text
|
||||
- default: kimai-change-me
|
||||
edit: true
|
||||
envKey: DB_PASSWORD
|
||||
labelEn: Database password
|
||||
labelZh: 数据库密码
|
||||
label:
|
||||
en: Database password
|
||||
zh: 数据库密码
|
||||
zh-Hant: 資料庫密碼
|
||||
ja: データベースパスワード
|
||||
ko: 데이터베이스 비밀번호
|
||||
ru: Пароль базы данных
|
||||
ms: Kata laluan pangkalan data
|
||||
pt-br: Senha do banco de dados
|
||||
required: true
|
||||
type: password
|
||||
rule: paramComplexity
|
||||
- default: ''
|
||||
edit: true
|
||||
envKey: APP_SECRET
|
||||
labelEn: Application secret
|
||||
labelZh: 应用密钥
|
||||
label:
|
||||
en: Application secret
|
||||
zh: 应用密钥
|
||||
zh-Hant: 應用程式密鑰
|
||||
ja: アプリケーションシークレット
|
||||
ko: 애플리케이션 비밀값
|
||||
ru: Секрет приложения
|
||||
ms: Rahsia aplikasi
|
||||
pt-br: Segredo do aplicativo
|
||||
random: true
|
||||
required: true
|
||||
type: password
|
||||
rule: paramComplexity
|
||||
- default: ./data/db
|
||||
edit: true
|
||||
envKey: DB_DATA_PATH
|
||||
labelEn: Database data path
|
||||
labelZh: 数据库数据目录
|
||||
label:
|
||||
en: Database data path
|
||||
zh: 数据库数据目录
|
||||
zh-Hant: 資料庫資料目錄
|
||||
ja: データベースデータディレクトリ
|
||||
ko: 데이터베이스 데이터 디렉터리
|
||||
ru: Каталог данных базы
|
||||
ms: Laluan data pangkalan data
|
||||
pt-br: Caminho de dados do banco
|
||||
required: true
|
||||
type: text
|
||||
- default: Asia/Shanghai
|
||||
edit: true
|
||||
envKey: TIME_ZONE
|
||||
labelEn: Time zone
|
||||
labelZh: 时区
|
||||
label:
|
||||
en: Time zone
|
||||
zh: 时区
|
||||
zh-Hant: 時區
|
||||
ja: タイムゾーン
|
||||
ko: 시간대
|
||||
ru: Часовой пояс
|
||||
ms: Zon waktu
|
||||
pt-br: Fuso horário
|
||||
required: true
|
||||
type: text
|
||||
- default: .*
|
||||
edit: true
|
||||
envKey: TRUSTED_HOSTS
|
||||
labelEn: Trusted hosts regex
|
||||
labelZh: 可信主机正则
|
||||
label:
|
||||
en: Trusted hosts regex
|
||||
zh: 可信主机正则
|
||||
zh-Hant: 可信主機正規表示式
|
||||
ja: 信頼するホストの正規表現
|
||||
ko: 신뢰할 호스트 정규식
|
||||
ru: Регулярное выражение доверенных хостов
|
||||
ms: Ungkapan biasa hos dipercayai
|
||||
pt-br: Expressao regular de hosts confiaveis
|
||||
required: true
|
||||
type: text
|
||||
- default: 127.0.0.1/32
|
||||
edit: true
|
||||
envKey: TRUSTED_PROXIES
|
||||
labelEn: Trusted proxies
|
||||
labelZh: 可信代理
|
||||
label:
|
||||
en: Trusted proxies
|
||||
zh: 可信代理
|
||||
zh-Hant: 可信代理
|
||||
ja: 信頼済みプロキシ
|
||||
ko: 신뢰할 수 있는 프록시
|
||||
ru: Доверенные прокси
|
||||
ms: Proksi dipercayai
|
||||
pt-br: Proxies confiaveis
|
||||
required: false
|
||||
type: text
|
||||
@@ -0,0 +1,41 @@
|
||||
networks:
|
||||
1panel-network:
|
||||
external: true
|
||||
services:
|
||||
kimai:
|
||||
image: "linuxserver/kimai:2.72.1"
|
||||
container_name: ${CONTAINER_NAME}
|
||||
restart: always
|
||||
networks:
|
||||
- 1panel-network
|
||||
ports:
|
||||
- "${PANEL_APP_PORT_HTTP}:80"
|
||||
- "${PANEL_APP_PORT_HTTPS}:443"
|
||||
volumes:
|
||||
- "${CONFIG_PATH}:/config"
|
||||
environment:
|
||||
- PUID=1000
|
||||
- PGID=1000
|
||||
- TZ=${TIME_ZONE}
|
||||
- APP_SECRET=${APP_SECRET}
|
||||
- DATABASE_URL=mysql://kimai:${DB_PASSWORD}@kimai-db:3306/kimai?charset=utf8mb4&serverVersion=11.4.2-MariaDB
|
||||
- TRUSTED_HOSTS=${TRUSTED_HOSTS}
|
||||
- TRUSTED_PROXIES=${TRUSTED_PROXIES}
|
||||
depends_on:
|
||||
- kimai-db
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
kimai-db:
|
||||
image: "mariadb:11.4"
|
||||
restart: always
|
||||
networks:
|
||||
- 1panel-network
|
||||
volumes:
|
||||
- "${DB_DATA_PATH}:/var/lib/mysql"
|
||||
environment:
|
||||
- MARIADB_ROOT_PASSWORD=${DB_PASSWORD}
|
||||
- MARIADB_DATABASE=kimai
|
||||
- MARIADB_USER=kimai
|
||||
- MARIADB_PASSWORD=${DB_PASSWORD}
|
||||
labels:
|
||||
createdBy: "Apps"
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
paths=(
|
||||
"${CONFIG_PATH:-./data/config}"
|
||||
"${DB_DATA_PATH:-./data/db}"
|
||||
)
|
||||
|
||||
mkdir -p "${paths[@]}"
|
||||
for path in "${paths[@]}"; do
|
||||
case "$path" in
|
||||
./*|../*) chown -R 1000:1000 "$path" 2>/dev/null || true ;;
|
||||
esac
|
||||
done
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
docker-compose down --volumes
|
||||
+89
@@ -0,0 +1,89 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ENV_FILE="${ENV_FILE:-./.env}"
|
||||
|
||||
ensure_env_default() {
|
||||
local key="$1"
|
||||
local value="$2"
|
||||
|
||||
if [[ ! -f "$ENV_FILE" ]]; then
|
||||
echo "$ENV_FILE not found; skipped $key migration"
|
||||
return
|
||||
fi
|
||||
|
||||
if grep -qE "^${key}=" "$ENV_FILE"; then
|
||||
echo "$key already exists"
|
||||
return
|
||||
fi
|
||||
|
||||
printf '%s=%s\n' "$key" "$value" >> "$ENV_FILE"
|
||||
echo "Added $key"
|
||||
}
|
||||
|
||||
read_env_value() {
|
||||
local key="$1"
|
||||
|
||||
if [[ ! -f "$ENV_FILE" ]] || ! grep -qE "^${key}=" "$ENV_FILE"; then
|
||||
return
|
||||
fi
|
||||
|
||||
local current
|
||||
current="$(sed -n -E "s/^${key}=//p" "$ENV_FILE" | tail -n 1)"
|
||||
current="${current%\"}"
|
||||
current="${current#\"}"
|
||||
current="${current%\'}"
|
||||
current="${current#\'}"
|
||||
printf '%s\n' "$current"
|
||||
}
|
||||
|
||||
escape_sed_replacement() {
|
||||
printf '%s' "$1" | sed -e 's/[\/&|]/\\&/g'
|
||||
}
|
||||
|
||||
set_env_value() {
|
||||
local key="$1"
|
||||
local value="$2"
|
||||
local replacement
|
||||
|
||||
replacement="$(escape_sed_replacement "$value")"
|
||||
if grep -qE "^${key}=" "$ENV_FILE"; then
|
||||
sed -i -E "s|^${key}=.*|${key}=${replacement}|" "$ENV_FILE"
|
||||
echo "Updated $key"
|
||||
return
|
||||
fi
|
||||
|
||||
printf '%s=%s\n' "$key" "$value" >> "$ENV_FILE"
|
||||
echo "Added $key"
|
||||
}
|
||||
|
||||
generate_secret() {
|
||||
local secret=""
|
||||
local chunk=""
|
||||
|
||||
while [[ ${#secret} -lt 64 ]]; do
|
||||
chunk="$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c $((64 - ${#secret})) || true)"
|
||||
secret="${secret}${chunk}"
|
||||
done
|
||||
printf '%s\n' "$secret"
|
||||
}
|
||||
|
||||
if [[ -f "$ENV_FILE" ]]; then
|
||||
app_secret="$(read_env_value APP_SECRET || true)"
|
||||
if [[ -z "$app_secret" ]]; then
|
||||
set_env_value "APP_SECRET" "$(generate_secret)"
|
||||
else
|
||||
echo "APP_SECRET already exists"
|
||||
fi
|
||||
|
||||
trusted_hosts="$(read_env_value TRUSTED_HOSTS || true)"
|
||||
if [[ -z "$trusted_hosts" ]]; then
|
||||
set_env_value "TRUSTED_HOSTS" ".*"
|
||||
else
|
||||
echo "TRUSTED_HOSTS already exists"
|
||||
fi
|
||||
|
||||
ensure_env_default "TRUSTED_PROXIES" "127.0.0.1/32"
|
||||
else
|
||||
echo "$ENV_FILE not found; skipped LinuxServer environment migration"
|
||||
fi
|
||||
Reference in New Issue
Block a user