diff --git a/README.md b/README.md index 0cdc28e..637652e 100755 --- a/README.md +++ b/README.md @@ -120,19 +120,19 @@ Das Inventarsystem stellt folgende Wartungsskripte bereit: **Option 1** ```bash -wget -O - https://raw.githubusercontent.com/AIIrondev/legendary-octo-garbanzo/main/install.sh | sudo bash +wget -O - https://git.invario-software.eu/Invario/Inventarsystem/raw/branch/main/install.sh | sudo bash ``` **Option 2** ```bash -curl -s https://raw.githubusercontent.com/AIIrondev/legendary-octo-garbanzo/main/install.sh | sudo bash +curl -s https://git.invario-software.eu/Invario/Inventarsystem/raw/branch/main/install.sh | sudo bash ``` Legacy-MongoDB uebernehmen und altes Host-System aufraeumen: ```bash -curl -s https://raw.githubusercontent.com/AIIrondev/legendary-octo-garbanzo/main/install.sh | \ +curl -s https://git.invario-software.eu/Invario/Inventarsystem/raw/branch/main/install.sh | \ sudo bash -s -- --migrate-legacy-db --remove-legacy-system ``` diff --git a/backup.sh b/backup.sh index c1c9f04..7f76bff 100755 --- a/backup.sh +++ b/backup.sh @@ -100,17 +100,25 @@ docker_backup() { output_dir="/tmp/invoice_archive_${timestamp}" remote_base="${output_dir}/${BASE_NAME}" - docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir" - docker compose -f "$COMPOSE_FILE" exec -T app python3 /app/Web/backup_invoices.py \ + # Wir verketten die kritischen Schritte mit &&. + # Falls der Pfad doch '/app/Web/...' sein sollte, passe ihn hier einfach wieder an. + docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir" && \ + docker compose -f "$COMPOSE_FILE" exec -T app python3 /app/backup_invoices.py \ --archive-dir "$output_dir" \ - --base-name "$BASE_NAME" - - mkdir -p "$INVOICE_ARCHIVE_DIR" - docker cp "$app_container":"${remote_base}.jsonl" "$INVOICE_ARCHIVE_DIR/" - docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/" + --base-name "$BASE_NAME" && \ + mkdir -p "$INVOICE_ARCHIVE_DIR" && \ + docker cp "$app_container":"${remote_base}.jsonl" "$INVOICE_ARCHIVE_DIR/" && \ + docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/" && \ docker cp "$app_container":"${remote_base}.meta.json" "$INVOICE_ARCHIVE_DIR/" + + # Hier fangen wir den Exit-Code der gesamten Kette ab + local backup_status=$? + # Dieser Befehl läuft immer (Aufräumen im Container), verändert aber nicht unseren Rückgabetatbestand docker compose -f "$COMPOSE_FILE" exec -T app rm -rf "$output_dir" + + # Jetzt geben wir den echten Status der Backup-Kette zurück + return $backup_status } main() { diff --git a/install.sh b/install.sh index 7ee0693..0071a83 100755 --- a/install.sh +++ b/install.sh @@ -8,8 +8,8 @@ else INSTALLER_DIR="$(pwd)" fi PROJECT_DIR="/opt/Inventarsystem" -REPO_SLUG="AIIrondev/legendary-octo-garbanzo" -API_URL="https://api.github.com/repos/$REPO_SLUG/releases/latest" +REPO_SLUG="Invario/Inventarsystem" +API_URL="https://git.invario-software.eu/api/v1/repos/$REPO_SLUG/releases/latest" BUNDLE_ASSET="inventarsystem-docker-bundle.tar.gz" APP_IMAGE_ASSET_PREFIX="inventarsystem-image-" LEGACY_DB_NAME="Inventarsystem" @@ -39,7 +39,7 @@ need_cmd() { refresh_start_script_from_main() { local start_url - start_url="https://raw.githubusercontent.com/$REPO_SLUG/main/start.sh" + start_url="https://git.invario-software.eu/$REPO_SLUG/raw/branch/main/start.sh" if curl -fsSL "$start_url" -o "$TMP_DIR/start.sh"; then sudo install -m 755 "$TMP_DIR/start.sh" "$PROJECT_DIR/start.sh" @@ -62,7 +62,7 @@ import re import sys compose_file, tag = sys.argv[1], sys.argv[2] -target_image = f"ghcr.io/aiirondev/legendary-octo-garbanzo:{tag}" +target_image = f"git.invario-software.eu/invario/inventarsystem:{tag}" with open(compose_file, "r", encoding="utf-8") as f: lines = f.readlines() @@ -173,9 +173,9 @@ Usage: $0 [options] Options: --migrate-legacy-db Back up host MongoDB and import into Docker MongoDB --remove-legacy-system Remove old host MongoDB/system after successful import - --skip-cleanup-old Do not run cleanup-old.sh after install - --cleanup-old-remove-cron Also remove matching cron entries during old-system cleanup - --multitenant Use docker-compose-multitenant.yml (default) + --skip-cleanup-old Do not run cleanup-old.sh after install + --cleanup-old-remove-cron Also remove matching cron entries during old-system cleanup + --multitenant Use docker-compose-multitenant.yml (default) --legacy-db-name Legacy database name (default: $LEGACY_DB_NAME) --legacy-mongo-uri Legacy Mongo URI (default: $LEGACY_MONGO_URI) --legacy-system-dir Optional old system directory to remove after migration @@ -432,8 +432,9 @@ main() { curl -fL "$image_url" -o "$TMP_DIR/inventarsystem-image-$tag.tar.gz" sudo docker load -i "$TMP_DIR/inventarsystem-image-$tag.tar.gz" >/dev/null - # Compatibility alias: some legacy compose bundles may still reference :latest. - sudo docker tag "ghcr.io/aiirondev/legendary-octo-garbanzo:$tag" "ghcr.io/aiirondev/legendary-octo-garbanzo:latest" >/dev/null 2>&1 || true + + # Tagge das geladene Gitea-Image als latest + sudo docker tag "git.invario-software.eu/invario/inventarsystem:$tag" "git.invario-software.eu/invario/inventarsystem:latest" >/dev/null 2>&1 || true if [ ! -f "$PROJECT_DIR/start.sh" ]; then echo "Error: release bundle is missing start.sh" @@ -470,19 +471,19 @@ EOF NUITKA_BUILD=0 INVENTAR_HTTP_PORT=10000 INVENTAR_HTTPS_PORT=10001 -INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:$tag +INVENTAR_APP_IMAGE=git.invario-software.eu/invario/inventarsystem:$tag EOF sudo install -m 644 "$TMP_DIR/.docker-build.env" "$PROJECT_DIR/.docker-build.env" elif sudo grep -q '^INVENTAR_APP_IMAGE=' "$PROJECT_DIR/.docker-build.env"; then - sudo sed -i "s|^INVENTAR_APP_IMAGE=.*|INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:$tag|" "$PROJECT_DIR/.docker-build.env" + sudo sed -i "s|^INVENTAR_APP_IMAGE=.*|INVENTAR_APP_IMAGE=git.invario-software.eu/invario/inventarsystem:$tag|" "$PROJECT_DIR/.docker-build.env" else - echo "INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:$tag" | sudo tee -a "$PROJECT_DIR/.docker-build.env" >/dev/null + echo "INVENTAR_APP_IMAGE=git.invario-software.eu/invario/inventarsystem:$tag" | sudo tee -a "$PROJECT_DIR/.docker-build.env" >/dev/null fi backup_legacy_database echo "Starting stack..." - sudo env INVENTAR_APP_IMAGE="ghcr.io/aiirondev/legendary-octo-garbanzo:$tag" bash "$PROJECT_DIR/start.sh" + sudo env INVENTAR_APP_IMAGE="git.invario-software.eu/invario/inventarsystem:$tag" bash "$PROJECT_DIR/start.sh" restore_legacy_backup_into_docker cleanup_old_services @@ -492,4 +493,4 @@ EOF echo "Open: https://localhost" } -main "$@" +main "$@" \ No newline at end of file diff --git a/start.sh b/start.sh index 2f3b1b1..9c27d3d 100755 --- a/start.sh +++ b/start.sh @@ -5,7 +5,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd "$SCRIPT_DIR" ENV_FILE="$SCRIPT_DIR/.docker-build.env" -APP_IMAGE_REPO="ghcr.io/aiirondev/legendary-octo-garbanzo" +APP_IMAGE_REPO="git.invario-software.eu/invario/inventarsystem" DIST_DIR="$SCRIPT_DIR/dist" RUNTIME_COMPOSE_OVERRIDE_FILE="$SCRIPT_DIR/.docker-compose.runtime.override.yml" @@ -676,4 +676,4 @@ fi verify_stack_health echo "Stack started." -echo "Open: http://:$HTTP_PORT_VALUE" +echo "Open: http://:$HTTP_PORT_VALUE" \ No newline at end of file diff --git a/update.sh b/update.sh index 6909d1e..c1e41b3 100755 --- a/update.sh +++ b/update.sh @@ -2,18 +2,18 @@ set -euo pipefail # Release-only updater for Docker deployment. -# Updates are pulled exclusively from GitHub Releases assets. +# Updates are pulled exclusively from Gitea Releases assets. PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" LOG_DIR="$PROJECT_DIR/logs" LOG_FILE="$LOG_DIR/update.log" STATE_FILE="$PROJECT_DIR/.release-version" -REPO_SLUG="AIIrondev/legendary-octo-garbanzo" -API_URL="https://api.github.com/repos/$REPO_SLUG/releases/latest" +REPO_SLUG="Invario/Inventarsystem" +API_URL="https://git.invario-software.eu/api/v1/repos/$REPO_SLUG/releases/latest" BUNDLE_ASSET="inventarsystem-docker-bundle.tar.gz" APP_IMAGE_ASSET_PREFIX="inventarsystem-image-" ENV_FILE="$PROJECT_DIR/.docker-build.env" -APP_IMAGE_REPO="ghcr.io/aiirondev/legendary-octo-garbanzo" +APP_IMAGE_REPO="git.invario-software.eu/invario/inventarsystem" DIST_DIR="$PROJECT_DIR/dist" COMPOSE_FILE="docker-compose-multitenant.yml" MIN_ROOT_FREE_MB="${INVENTAR_MIN_ROOT_FREE_MB:-2048}" @@ -153,7 +153,7 @@ Usage: $0 [options] Options: --multitenant Use docker-compose-multitenant.yml (default) - development Install development build from GHCR or local dist + development Install development build from Gitea Registry or local dist -h, --help Show this help message EOF } @@ -275,10 +275,10 @@ load_release_image() { refresh_runtime_scripts_from_main() { local start_url stop_url restart_url update_url - start_url="https://raw.githubusercontent.com/$REPO_SLUG/main/start.sh" - stop_url="https://raw.githubusercontent.com/$REPO_SLUG/main/stop.sh" - restart_url="https://raw.githubusercontent.com/$REPO_SLUG/main/restart.sh" - update_url="https://raw.githubusercontent.com/$REPO_SLUG/main/update.sh" + start_url="https://git.invario-software.eu/$REPO_SLUG/raw/branch/main/start.sh" + stop_url="https://git.invario-software.eu/$REPO_SLUG/raw/branch/main/stop.sh" + restart_url="https://git.invario-software.eu/$REPO_SLUG/raw/branch/main/restart.sh" + update_url="https://git.invario-software.eu/$REPO_SLUG/raw/branch/main/update.sh" curl -fsSL "$start_url" -o "$PROJECT_DIR/start.sh" || log_message "WARNING: Could not refresh start.sh from main" curl -fsSL "$stop_url" -o "$PROJECT_DIR/stop.sh" || log_message "WARNING: Could not refresh stop.sh from main" @@ -357,7 +357,7 @@ download_and_extract_bundle() { cp -f "$tmp_dir/update.sh" "$PROJECT_DIR/update.sh" fi - # Neu: Multi-Tenant Ressourcen kopieren, falls vorhanden + # Multi-Tenant Ressourcen kopieren, falls vorhanden if [ -f "$tmp_dir/docker-compose-multitenant.yml" ]; then cp -f "$tmp_dir/docker-compose-multitenant.yml" "$PROJECT_DIR/docker-compose-multitenant.yml" fi @@ -374,7 +374,7 @@ download_and_extract_bundle() { done # Ensure executable permissions on all copied scripts - chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh" "$PROJECT_DIR/backup.sh" "$PROJECT_DIR/manage-tenant.sh" "$PROJECT_DIR/run-tenant-cmd.sh" 2>/dev/null || true 2>/dev/null || true + chmod +x "$PROJECT_DIR/start.sh" "$PROJECT_DIR/stop.sh" "$PROJECT_DIR/restart.sh" "$PROJECT_DIR/update.sh" "$PROJECT_DIR/backup.sh" "$PROJECT_DIR/manage-tenant.sh" "$PROJECT_DIR/run-tenant-cmd.sh" 2>/dev/null || true chmod +x "$PROJECT_DIR"/manage-tenant.sh "$PROJECT_DIR"/run-tenant-cmd.sh 2>/dev/null || true if [ ! -f "$PROJECT_DIR/config.json" ] && [ -f "$tmp_dir/config.json" ]; then @@ -412,7 +412,7 @@ EOF if ! load_local_dist_image "$tag"; then if ! load_release_image "$meta_file" "$tag"; then - log_message "Falling back to tagged GHCR image $app_image" + log_message "Falling back to tagged Gitea Registry image $app_image" if ! docker pull "$app_image" >> "$LOG_FILE" 2>&1; then log_message "Falling back to local Docker build for $app_image" docker build -t "$app_image" "$PROJECT_DIR" >> "$LOG_FILE" 2>&1 @@ -511,7 +511,7 @@ EOF printf '\nINVENTAR_APP_IMAGE=%s\n' "$app_image" >> "$ENV_FILE" fi - # Try local dist first, then pull from GHCR + # Try local dist first, then pull from Gitea Registry if ! load_local_dist_image "$tag"; then log_message "Attempting to pull development image $app_image" if ! docker pull "$app_image" >> "$LOG_FILE" 2>&1; then @@ -540,7 +540,7 @@ EOF trap 'rm -rf "${tmp_dir:-}"' EXIT - log_message "Checking latest GitHub release for $REPO_SLUG..." + log_message "Checking latest Gitea release for $REPO_SLUG..." if ! fetch_release_metadata "$meta_file"; then log_message "WARNING: Could not fetch release metadata. Falling back to self-healing start path." if INVENTAR_SETUP_CRON=0 bash "$PROJECT_DIR/start.sh" >> "$LOG_FILE" 2>&1; then @@ -623,7 +623,7 @@ EOF log_message "Update completed successfully to release $latest_tag" sudo ./opt/Inventarsystem/restart.sh - echo "Restart of the Server Completet" + echo "Restart of the Server Completed" } -main "$@" +main "$@" \ No newline at end of file