Add versioning to CSS file links in base template

.github/workflows/release-docker.yml

@@ -19,6 +19,9 @@ permissions:
   contents: write
   packages: write
 
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
+
 jobs:
   release-docker:
     runs-on: ubuntu-latest
@@ -221,11 +224,11 @@ jobs:
           cp start.sh release-bundle/start.sh
           cp stop.sh release-bundle/stop.sh
           cp restart.sh release-bundle/restart.sh
-          cp backup-docker.sh release-bundle/backup-docker.sh
+          cp backup.sh release-bundle/backup.sh
           cp update.sh release-bundle/update.sh
           cp init-admin.sh release-bundle/init-admin.sh
 
-          chmod +x release-bundle/start.sh release-bundle/stop.sh release-bundle/restart.sh release-bundle/backup-docker.sh release-bundle/update.sh release-bundle/init-admin.sh
+          chmod +x release-bundle/start.sh release-bundle/stop.sh release-bundle/restart.sh release-bundle/backup.sh release-bundle/update.sh release-bundle/init-admin.sh
           tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
 
       - name: Create or update GitHub Release

.gitignore

@@ -1,4 +1,5 @@
 dist
 logs
 certs
-build
+build
+.venv

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://raw.githubusercontent.com/AIIrondev/legendary-octo-garbanzo/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://raw.githubusercontent.com/AIIrondev/legendary-octo-garbanzo/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://raw.githubusercontent.com/AIIrondev/legendary-octo-garbanzo/main/install.sh | \
   sudo bash -s -- --migrate-legacy-db --remove-legacy-system
 ```
 

Web/templates/base.html

@@ -20,8 +20,8 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700;800&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/planned_appointments.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css', v=APP_VERSION) }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/planned_appointments.css', v=APP_VERSION) }}">
     <link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}">
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
     <style>

config.json

@@ -1,7 +1,7 @@
 {
     "dbg": false,
     "key": "InventarsystemSecureKey2026XYZ789abcdef012",
-    "ver": "3.2.1",
+    "ver": "0.0.2",
     "host": "0.0.0.0",
     "port": 443,
 

install.sh

@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-INSTALLER_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+INSTALLER_SOURCE="${BASH_SOURCE[0]-$0}"
+if [ -n "$INSTALLER_SOURCE" ] && [ "$INSTALLER_SOURCE" != "bash" ] && [ "$INSTALLER_SOURCE" != "-bash" ] && [ "$INSTALLER_SOURCE" != "sh" ] && [ "$INSTALLER_SOURCE" != "-" ] && [ -e "$INSTALLER_SOURCE" ]; then
+    INSTALLER_DIR="$(cd "$(dirname "$INSTALLER_SOURCE")" && pwd)"
+else
+    INSTALLER_DIR="$(pwd)"
+fi
 PROJECT_DIR="/opt/Inventarsystem"
-REPO_SLUG="AIIrondev/Inventarsystem"
+REPO_SLUG="AIIrondev/legendary-octo-garbanzo"
 API_URL="https://api.github.com/repos/$REPO_SLUG/releases/latest"
 BUNDLE_ASSET="inventarsystem-docker-bundle.tar.gz"
 APP_IMAGE_ASSET_PREFIX="inventarsystem-image-"
@@ -16,6 +21,13 @@ LEGACY_SYSTEM_DIR=""
 LEGACY_BACKUP_ARCHIVE=""
 CLEANUP_OLD_SERVICES=true
 CLEANUP_OLD_REMOVE_CRON=false
+TMP_DIR=""
+
+cleanup_tmp_dir() {
+    if [ -n "${TMP_DIR:-}" ] && [ -d "$TMP_DIR" ]; then
+        rm -rf "$TMP_DIR"
+    fi
+}
 
 need_cmd() {
     if ! command -v "$1" >/dev/null 2>&1; then
@@ -24,6 +36,83 @@ need_cmd() {
     fi
 }
 
+refresh_start_script_from_main() {
+    local start_url
+    start_url="https://raw.githubusercontent.com/$REPO_SLUG/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"
+    else
+        echo "Warning: failed to refresh start.sh from main; using bundled start.sh"
+    fi
+}
+
+pin_compose_app_image() {
+    local tag="$1"
+    local compose_file
+    compose_file="$PROJECT_DIR/docker-compose.yml"
+
+    if [ ! -f "$compose_file" ]; then
+        echo "Warning: $compose_file not found; cannot pin app image"
+        return 0
+    fi
+
+    python3 - <<'PY' "$compose_file" "$tag"
+import re
+import sys
+
+compose_file, tag = sys.argv[1], sys.argv[2]
+target_image = f"ghcr.io/aiirondev/legendary-octo-garbanzo:{tag}"
+
+with open(compose_file, "r", encoding="utf-8") as f:
+    lines = f.readlines()
+
+out = []
+in_app = False
+in_build = False
+image_set = False
+
+for line in lines:
+    stripped = line.lstrip(" ")
+    indent = len(line) - len(stripped)
+
+    if not in_app and re.match(r"^\s{2}app:\s*$", line):
+        in_app = True
+        image_set = False
+        out.append(line)
+        out.append(f"    image: {target_image}\n")
+        image_set = True
+        continue
+
+    if in_app:
+        if indent == 2 and re.match(r"^[A-Za-z0-9_-]+:\s*$", stripped):
+            in_app = False
+            in_build = False
+
+        if in_app:
+            if in_build:
+                if indent > 4:
+                    continue
+                in_build = False
+
+            if re.match(r"^\s{4}build:\s*$", line):
+                in_build = True
+                continue
+
+            if re.match(r"^\s{4}image:\s*", line):
+                if image_set:
+                    continue
+                out.append(f"    image: {target_image}\n")
+                image_set = True
+                continue
+
+    out.append(line)
+
+with open(compose_file, "w", encoding="utf-8") as f:
+    f.writelines(out)
+PY
+}
+
 install_docker_if_missing() {
     if command -v docker >/dev/null 2>&1; then
         return 0
@@ -258,10 +347,10 @@ main() {
     need_cmd python3
     need_cmd curl
 
-    local tmp_dir meta_file tag bundle_url image_url
-    tmp_dir="$(mktemp -d)"
-    meta_file="$tmp_dir/release.json"
-    trap 'rm -rf "$tmp_dir"' EXIT
+    local meta_file tag bundle_url image_url
+    TMP_DIR="$(mktemp -d)"
+    meta_file="$TMP_DIR/release.json"
+    trap cleanup_tmp_dir EXIT
 
     mapfile -t release_info < <(latest_tag_and_bundle_url "$meta_file")
     tag="${release_info[0]:-}"
@@ -277,16 +366,20 @@ main() {
     echo "Installing Inventarsystem release $tag into $PROJECT_DIR"
     sudo mkdir -p "$PROJECT_DIR"
 
-    curl -fL "$bundle_url" -o "$tmp_dir/$BUNDLE_ASSET"
-    sudo tar -xzf "$tmp_dir/$BUNDLE_ASSET" -C "$PROJECT_DIR"
+    curl -fL "$bundle_url" -o "$TMP_DIR/$BUNDLE_ASSET"
+    sudo tar -xzf "$TMP_DIR/$BUNDLE_ASSET" -C "$PROJECT_DIR"
+
+    pin_compose_app_image "$tag"
 
     if [ -z "$image_url" ]; then
         echo "Error: release image asset is missing"
         exit 1
     fi
 
-    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
+    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
 
     if [ ! -f "$PROJECT_DIR/start.sh" ]; then
         echo "Error: release bundle is missing start.sh"
@@ -297,16 +390,18 @@ main() {
         exit 1
     fi
     if [ ! -f "$PROJECT_DIR/restart.sh" ]; then
-        cat > "$tmp_dir/restart.sh" <<'EOF'
+        cat > "$TMP_DIR/restart.sh" <<'EOF'
 #!/usr/bin/env bash
 set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 "$SCRIPT_DIR/stop.sh"
 "$SCRIPT_DIR/start.sh"
 EOF
-        sudo install -m 755 "$tmp_dir/restart.sh" "$PROJECT_DIR/restart.sh"
+        sudo install -m 755 "$TMP_DIR/restart.sh" "$PROJECT_DIR/restart.sh"
     fi
 
+    refresh_start_script_from_main
+
     if [ ! -f "$PROJECT_DIR/cleanup-old.sh" ] && [ -f "$INSTALLER_DIR/cleanup-old.sh" ]; then
         sudo install -m 755 "$INSTALLER_DIR/cleanup-old.sh" "$PROJECT_DIR/cleanup-old.sh"
     fi
@@ -317,23 +412,23 @@ EOF
     echo "$tag" | sudo tee "$PROJECT_DIR/.release-version" >/dev/null
 
     if [ ! -f "$PROJECT_DIR/.docker-build.env" ]; then
-        cat > "$tmp_dir/.docker-build.env" <<EOF
+        cat > "$TMP_DIR/.docker-build.env" <<EOF
 NUITKA_BUILD=0
 INVENTAR_HTTP_PORT=80
 INVENTAR_HTTPS_PORT=443
-INVENTAR_APP_IMAGE=ghcr.io/aiirondev/inventarsystem:$tag
+INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:$tag
 EOF
-        sudo install -m 644 "$tmp_dir/.docker-build.env" "$PROJECT_DIR/.docker-build.env"
+        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/inventarsystem:$tag|" "$PROJECT_DIR/.docker-build.env"
+        sudo sed -i "s|^INVENTAR_APP_IMAGE=.*|INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:$tag|" "$PROJECT_DIR/.docker-build.env"
     else
-        echo "INVENTAR_APP_IMAGE=ghcr.io/aiirondev/inventarsystem:$tag" | sudo tee -a "$PROJECT_DIR/.docker-build.env" >/dev/null
+        echo "INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:$tag" | sudo tee -a "$PROJECT_DIR/.docker-build.env" >/dev/null
     fi
 
     backup_legacy_database
 
     echo "Starting stack..."
-    sudo bash "$PROJECT_DIR/start.sh"
+    sudo env INVENTAR_APP_IMAGE="ghcr.io/aiirondev/legendary-octo-garbanzo:$tag" bash "$PROJECT_DIR/start.sh"
 
     restore_legacy_backup_into_docker
     cleanup_old_services

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/inventarsystem"
+APP_IMAGE_REPO="ghcr.io/aiirondev/legendary-octo-garbanzo"
 DIST_DIR="$SCRIPT_DIR/dist"
 
 SUDO=""
@@ -17,7 +17,7 @@ NUITKA_BUILD_VALUE="0"
 HTTP_PORT_VALUE="80"
 HTTPS_PORT_VALUE="443"
 CRON_SETUP_VALUE="${INVENTAR_SETUP_CRON:-1}"
-APP_IMAGE_VALUE="${INVENTAR_APP_IMAGE:-ghcr.io/aiirondev/inventarsystem:latest}"
+APP_IMAGE_VALUE="${INVENTAR_APP_IMAGE:-$APP_IMAGE_REPO:latest}"
 
 usage() {
     cat <<EOF
@@ -364,11 +364,12 @@ configure_nuitka_mode() {
 }
 
 resolve_app_image() {
-    local env_image="" release_tag=""
+    local env_image="" release_tag="" default_latest
+    default_latest="$APP_IMAGE_REPO:latest"
 
     if [ -f "$ENV_FILE" ]; then
         env_image="$(awk -F= '/^INVENTAR_APP_IMAGE=/{print $2}' "$ENV_FILE" | tail -n1 | tr -d ' ' || true)"
-        if [ -n "$env_image" ] && [ "$env_image" != "ghcr.io/aiirondev/inventarsystem:latest" ]; then
+        if [ -n "$env_image" ] && [ "$env_image" != "$default_latest" ]; then
             APP_IMAGE_VALUE="$env_image"
             return 0
         fi
@@ -379,7 +380,7 @@ resolve_app_image() {
     fi
 
     if [ -n "$release_tag" ]; then
-        APP_IMAGE_VALUE="ghcr.io/aiirondev/inventarsystem:$release_tag"
+        APP_IMAGE_VALUE="$APP_IMAGE_REPO:$release_tag"
         return 0
     fi