fix: prepare writable data mount in installer

This commit is contained in:
3252a8
2026-06-02 10:30:43 +03:00
parent 162e9e20b5
commit 0473829f7a
3 changed files with 49 additions and 0 deletions
+1
View File
@@ -27,6 +27,7 @@ Wizard работает через меню с цифрами и подтвер
- скачать выбранный compose-профиль (`Caddy`, `Nginx`, `Pangolin/Newt` или `no-proxy`); - скачать выбранный compose-профиль (`Caddy`, `Nginx`, `Pangolin/Newt` или `no-proxy`);
- сгенерировать минимальный `.env`, включая пароли и стабильные secrets; - сгенерировать минимальный `.env`, включая пароли и стабильные secrets;
- сохранить backup существующих файлов перед перезаписью; - сохранить backup существующих файлов перед перезаписью;
- подготовить writable `data/` для файлов приложения;
- запустить `docker compose pull && docker compose up -d`; - запустить `docker compose pull && docker compose up -d`;
- проверить текущий стек через `docker compose ps` и логи `migrate`; - проверить текущий стек через `docker compose ps` и логи `migrate`;
- запустить миграцию из поддерживаемых ботов: Remnashop и старый - запустить миграцию из поддерживаемых ботов: Remnashop и старый
+36
View File
@@ -8,6 +8,8 @@ DEFAULT_REF="${MINISHOP_INSTALL_REF:-main}"
DEFAULT_IMAGE_TAG="${MINISHOP_IMAGE_TAG:-latest}" DEFAULT_IMAGE_TAG="${MINISHOP_IMAGE_TAG:-latest}"
INSTALL_STATE_DIR=".installer" INSTALL_STATE_DIR=".installer"
IMPORTER_CACHE_PATH="$INSTALL_STATE_DIR/import_legacy.py" IMPORTER_CACHE_PATH="$INSTALL_STATE_DIR/import_legacy.py"
APP_UID=10001
APP_GID=10001
OLD_TGSHOP_DB_VOLUME="remnawave-tg-shop-db-data" OLD_TGSHOP_DB_VOLUME="remnawave-tg-shop-db-data"
NEW_MINISHOP_DB_VOLUME="remnawave-minishop-db-data" NEW_MINISHOP_DB_VOLUME="remnawave-minishop-db-data"
OLD_TGSHOP_CADDY_DATA_VOLUME="remnawave-tg-shop-caddy-data" OLD_TGSHOP_CADDY_DATA_VOLUME="remnawave-tg-shop-caddy-data"
@@ -635,6 +637,37 @@ write_env_file() {
ok "Wrote $ENV_PATH" ok "Wrote $ENV_PATH"
} }
prepare_data_mount() {
section "Prepare data mount"
data_dir="$TARGET_DIR/data"
created=0
if [ ! -d "$data_dir" ]; then
mkdir -p "$data_dir" || return 1
created=1
fi
if [ "$created" = "1" ]; then
if command -v chown >/dev/null 2>&1; then
if ! chown "$APP_UID:$APP_GID" "$data_dir" 2>/dev/null; then
warn "Could not chown $data_dir. Run: sudo chown $APP_UID:$APP_GID data"
fi
fi
chmod u+rwx "$data_dir" 2>/dev/null || true
ok "Created writable $data_dir"
return 0
fi
info "$data_dir already exists."
if confirm "Adjust $data_dir owner to $APP_UID:$APP_GID for container writes?" 0; then
if command -v chown >/dev/null 2>&1; then
if ! chown "$APP_UID:$APP_GID" "$data_dir" 2>/dev/null; then
warn "Could not chown $data_dir. Run: sudo chown $APP_UID:$APP_GID data"
fi
fi
chmod u+rwx "$data_dir" 2>/dev/null || true
fi
}
require_docker() { require_docker() {
if command -v docker >/dev/null 2>&1 && docker compose version >/dev/null 2>&1; then if command -v docker >/dev/null 2>&1 && docker compose version >/dev/null 2>&1; then
COMPOSE_STYLE="docker" COMPOSE_STYLE="docker"
@@ -1049,6 +1082,7 @@ install_flow() {
download_profile_files || return 1 download_profile_files || return 1
write_env_file || return 1 write_env_file || return 1
mkdir -p "$TARGET_DIR/$INSTALL_STATE_DIR" mkdir -p "$TARGET_DIR/$INSTALL_STATE_DIR"
prepare_data_mount || return 1
if [ "$with_migration" = "1" ]; then if [ "$with_migration" = "1" ]; then
choose_legacy_source choose_legacy_source
elif confirm "Run a migration from another bot now?" 0; then elif confirm "Run a migration from another bot now?" 0; then
@@ -1080,6 +1114,8 @@ migration_only_flow() {
LEGACY_SOURCE="" LEGACY_SOURCE=""
installation_directory || return 1 installation_directory || return 1
choose_legacy_source choose_legacy_source
[ "$LEGACY_SOURCE" = "skip" ] && return 0
prepare_data_mount || return 1
case "$LEGACY_SOURCE" in case "$LEGACY_SOURCE" in
remnashop) remnashop)
github_source || return 1 github_source || return 1
+12
View File
@@ -48,3 +48,15 @@ def test_shell_installer_supports_legacy_tgshop_volume_and_dsn_paths():
assert "remnawave-minishop-db-data" in script assert "remnawave-minishop-db-data" in script
assert "pg_dump --clean --if-exists" in script assert "pg_dump --clean --if-exists" in script
assert "run_compose run --rm migrate" in script assert "run_compose run --rm migrate" in script
def test_shell_installer_only_prepares_data_mount_not_runtime_content():
script = INSTALL_SCRIPT.read_text(encoding="utf-8")
assert 'data_dir="$TARGET_DIR/data"' in script
assert "mkdir -p \"$data_dir\"" in script
assert "chown \"$APP_UID:$APP_GID\" \"$data_dir\"" in script
assert "data_dir/themes" not in script
assert "webapp-logo" not in script
assert "webapp-emoji" not in script
assert "locales-overrides.json" not in script