Merge branch 'feature/gitops'

.gitea/workflows/build-containers-on-demand.yml

@@ -1,259 +0,0 @@
-name: Build containers when image tags change
-
-on:
-  push:
-    # Uncomment/adjust once working:
-    # branches: [ main ]
-    paths:
-      - "argocd/deployment.yaml"
-      - "Dockerfile"
-      - "data-loader/**"
-      - ".gitea/workflows/build-containers-on-demand.yml"
-
-jobs:
-  build-if-image-changed:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - container_name: web
-            expected_repo: git.baumann.gr/adebaumann/vui
-            build_context: .
-            container_type: containers
-            description: main container
-          - container_name: loader
-            expected_repo: git.baumann.gr/adebaumann/vui-data-loader
-            build_context: data-loader
-            container_type: initContainers
-            description: init-container
-
-    env:
-      DEPLOY_FILE: "argocd/deployment.yaml"
-      CONTAINER_NAME: ${{ matrix.container_name }}
-      EXPECTED_REPO: ${{ matrix.expected_repo }}
-      CONTAINER_TYPE: ${{ matrix.container_type }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - name: Determine base commit
-        id: base
-        shell: bash
-        run: |
-          set -euo pipefail
-          if git rev-parse --verify -q HEAD~1 >/dev/null; then
-            echo "base=$(git rev-parse HEAD~1)" >> "$GITHUB_OUTPUT"
-          else
-            echo "base=$(git hash-object -t tree /dev/null)" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Install yq
-        shell: bash
-        run: |
-          set -euo pipefail
-          YQ_VER=v4.44.3
-          curl -sL "https://github.com/mikefarah/yq/releases/download/${YQ_VER}/yq_linux_amd64" -o /usr/local/bin/yq
-          chmod +x /usr/local/bin/yq
-          yq --version
-
-      - name: Read ${{ matrix.description }} image from deployment (old vs new)
-        id: img
-        shell: bash
-        run: |
-          set -euo pipefail
-          file="${DEPLOY_FILE:-argocd/deployment.yaml}"
-          cname="${CONTAINER_NAME}"
-          expected_repo="${EXPECTED_REPO}"
-          ctype="${CONTAINER_TYPE}"
-
-          export cname
-          export expected_repo
-          export ctype
-
-          echo "========================================"
-          echo "Checking: $ctype / $cname"
-          echo "Expected repo: $expected_repo"
-          echo "========================================"
-
-          # --- functions ------------------------------------------------------
-          have_yq() { command -v yq >/dev/null 2>&1; }
-
-          # yq-based extractor (multi-doc aware; Deployment only; container name match)
-          yq_extract() {
-            if [[ "$ctype" == "initContainers" ]]; then
-              yq -r '
-                select(.kind == "Deployment") |
-                .spec.template.spec.initContainers // [] |
-                map(select(.name == env(cname))) |
-                .[]?.image
-              ' "$1" 2>/dev/null | tail -n 1
-            else
-              yq -r '
-                select(.kind == "Deployment") |
-                .spec.template.spec.containers // [] |
-                map(select(.name == env(cname))) |
-                .[]?.image
-              ' "$1" 2>/dev/null | tail -n 1
-            fi
-          }
-
-          # ultra-tolerant fallback: grep around the appropriate block
-          fallback_extract() {
-            local block_pattern
-            local end_pattern
-
-            if [[ "$ctype" == "initContainers" ]]; then
-              block_pattern="^[[:space:]]*initContainers:"
-              end_pattern="^[[:space:]]*containers:|^[[:alpha:]][[:alnum:]_:-]*:"
-            else
-              block_pattern="^[[:space:]]*containers:"
-              end_pattern="^[[:alpha:]][[:alnum:]_:-]*:|^[[:space:]]*initContainers:"
-            fi
-
-            awk -v cname="$cname" -v block="$block_pattern" -v endp="$end_pattern" '
-              BEGIN{ in_cont=0; name=""; image="" }
-              $0 ~ block {in_cont=1; next}
-              in_cont {
-                # end of block when we hit the end pattern
-                if ($0 ~ endp) { in_cont=0 }
-                # capture name and image lines
-                if ($0 ~ /^[[:space:]]*-?[[:space:]]*name:[[:space:]]*/) {
-                  name=$0; sub(/^.*name:[[:space:]]*/,"",name); gsub(/^[ "\047]+|[ "\047]+$/,"",name)
-                }
-                if ($0 ~ /^[[:space:]]*image:[[:space:]]*/) {
-                  image=$0; sub(/^.*image:[[:space:]]*/,"",image); gsub(/^[ "\047]+|[ "\047]+$/,"",image)
-                  if (name==cname) { print image; exit }
-                }
-              }
-            ' "$1"
-          }
-
-          list_workload_images() {
-            echo "== workload $ctype in $1 ==" >&2
-            if have_yq; then
-              if [[ "$ctype" == "initContainers" ]]; then
-                yq -r '
-                  select(.kind == "Deployment") |
-                  .spec.template.spec.initContainers // [] |
-                  .[] | "\(.name): \(.image)"
-                ' "$1" 2>/dev/null | nl -ba >&2 || true
-              else
-                yq -r '
-                  select(.kind == "Deployment") |
-                  .spec.template.spec.containers // [] |
-                  .[] | "\(.name): \(.image)"
-                ' "$1" 2>/dev/null | nl -ba >&2 || true
-              fi
-            else
-              # coarse list for visibility
-              if [[ "$ctype" == "initContainers" ]]; then
-                awk '
-                  /^ *initContainers:/, /^ *containers:/ { if ($0 ~ /name:|image:/) print }
-                ' "$1" | nl -ba >&2 || true
-              else
-                awk '
-                  /^ *containers:/, /^[^ ]/ { if ($0 ~ /name:|image:/) print }
-                ' "$1" | nl -ba >&2 || true
-              fi
-            fi
-          }
-          # --------------------------------------------------------------------
-
-          # Ensure yq is present; if install failed earlier, try once more
-          if ! have_yq; then
-            echo "yq missing; attempting quick install..." >&2
-            curl -fsSL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/local/bin/yq || true
-            chmod +x /usr/local/bin/yq || true
-          fi
-
-          # Prepare old file (previous commit) if exists
-          if git cat-file -e "${{ steps.base.outputs.base }}":"$file" 2>/dev/null; then
-            git show "${{ steps.base.outputs.base }}:$file" > /tmp/old.yaml
-          else
-            : > /tmp/old.yaml
-          fi
-
-          list_workload_images /tmp/old.yaml || true
-          list_workload_images "$file" || true
-
-          if have_yq; then
-            old_image="$(yq_extract /tmp/old.yaml || true)"
-            new_image="$(yq_extract "$file" || true)"
-          else
-            old_image="$(fallback_extract /tmp/old.yaml || true)"
-            new_image="$(fallback_extract "$file" || true)"
-          fi
-
-          # If yq path failed to find it, try fallback once more as safety
-          if [ -z "${new_image:-}" ]; then
-            new_image="$(fallback_extract "$file" || true)"
-          fi
-          if [ -z "${old_image:-}" ]; then
-            old_image="$(fallback_extract /tmp/old.yaml || true)"
-          fi
-
-          echo "Old $ctype image: ${old_image:-<none>}"
-          echo "New $ctype image: ${new_image:-<none>}"
-
-          if [ -z "${new_image:-}" ]; then
-            echo "ERROR: Could not find $ctype[].name == \"$cname\" image in $file"
-            exit 1
-          fi
-
-          # Split repo and tag
-          new_repo="${new_image%:*}"
-          new_tag="${new_image##*:}"
-          if [[ "$new_repo" != "$expected_repo" ]]; then
-            echo "ERROR: Found $ctype \"$cname\" image repo is \"$new_repo\" but expected \"$expected_repo\""
-            exit 1
-          fi
-          if [ -n "${old_image:-}" ]; then
-            old_tag="${old_image##*:}"
-          else
-            old_tag=""
-          fi
-
-          registry="$(echo "$new_repo" | awk -F/ '{print $1}')"
-
-          {
-            echo "changed=$([ "$old_tag" != "$new_tag" ] && echo true || echo false)"
-            echo "new_image=$new_image"
-            echo "new_repo=$new_repo"
-            echo "new_tag=$new_tag"
-            echo "registry=$registry"
-          } >> "$GITHUB_OUTPUT"
-
-      - name: Skip if tag unchanged
-        if: steps.img.outputs.changed != 'true'
-        run: echo "${{ matrix.description }} image tag unchanged; skipping build."
-
-      - name: Set up Buildx
-        if: steps.img.outputs.changed == 'true'
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to registry
-        if: steps.img.outputs.changed == 'true'
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ steps.img.outputs.registry }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build and push ${{ matrix.description }} (exact tag from deployment)
-        if: steps.img.outputs.changed == 'true'
-        uses: docker/build-push-action@v6
-        with:
-          context: ${{ matrix.build_context }}
-          push: true
-          tags: |
-            ${{ steps.img.outputs.new_image }}
-            ${{ steps.img.outputs.new_repo }}:latest
-          labels: |
-            org.opencontainers.image.source=${{ gitea.repository }}
-            org.opencontainers.image.revision=${{ gitea.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.gitea/workflows/build-on-demand.yml

@@ -0,0 +1,142 @@
+name: Build image when workload image tag changes
+
+on:
+  push:
+    branches: [ deployment ]                 # adjust if needed
+    paths:
+      - "arcocd/deployment.yaml"
+      - "Dockerfile"                   # keep if you also want to rebuild when Dockerfile changes
+
+jobs:
+  build-if-image-changed:
+    runs-on: ubuntu-latest
+
+    env:
+      DEPLOY_FILE: "arcocd/deployment.yaml"
+      TARGET_REPO: "git.baumann.gr/adebaumann/vui"   # repo (no tag)
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Determine base commit
+        id: base
+        shell: bash
+        run: |
+          set -euo pipefail
+          if git rev-parse --verify -q HEAD~1 >/dev/null; then
+            echo "base=$(git rev-parse HEAD~1)" >> "$GITHUB_OUTPUT"
+          else
+            echo "base=$(git hash-object -t tree /dev/null)" >> "$GITHUB_OUTPUT"
+          fi
+
+      # Install yq for robust YAML parsing
+      - name: Install yq
+        shell: bash
+        run: |
+          set -euo pipefail
+          YQ_VER=v4.44.3
+          curl -sL "https://github.com/mikefarah/yq/releases/download/${YQ_VER}/yq_linux_amd64" -o /usr/local/bin/yq
+          chmod +x /usr/local/bin/yq
+          yq --version
+
+      - name: Read workload image from deployment (old vs new)
+        id: img
+        shell: bash
+        run: |
+          set -euo pipefail
+          file="$DEPLOY_FILE"
+          repo="$TARGET_REPO"
+
+          # Function: from a deployment yaml, read .spec.template.spec.containers[].image
+          # and select the one whose image starts with "$repo:"
+          extract() {
+            yq -r '
+              .spec.template.spec.containers // []                       # only real containers, not initContainers
+              | map(.image) | .[]?                                        # images as strings
+              | select(startswith(env(repo) + ":"))                       # match exact repo + ":"
+            ' "$1" 2>/dev/null | tail -n 1
+          }
+
+          # Old image from previous commit (if file existed)
+          if git cat-file -e "${{ steps.base.outputs.base }}":"$file" 2>/dev/null; then
+            git show "${{ steps.base.outputs.base }}:$file" > /tmp/old.yaml
+            old_image="$(extract /tmp/old.yaml || true)"
+          else
+            old_image=""
+          fi
+
+          # New image from workspace
+          if [ -f "$file" ]; then
+            new_image="$(extract "$file" || true)"
+          else
+            new_image=""
+          fi
+
+          echo "Old workload image: $old_image"
+          echo "New workload image: $new_image"
+
+          # Helpers to split repo and tag (handles registry with port)
+          parse_tag() {
+            local ref="$1"
+            local after_slash="${ref##*/}"
+            if [[ "$after_slash" == *:* ]]; then echo "${after_slash##*:}"; else echo ""; fi
+          }
+          parse_repo() {
+            local ref="$1"
+            local tag="$(parse_tag "$ref")"
+            if [ -n "$tag" ]; then echo "${ref%:$tag}"; else echo "$ref"; fi
+          }
+
+          old_tag="$(parse_tag "$old_image")"
+          new_tag="$(parse_tag "$new_image")"
+          new_repo="$(parse_repo "$new_image")"
+
+          if [ -z "$new_image" ]; then
+            echo "ERROR: Could not find a containers[].image starting with ${repo}: in $file"
+            exit 1
+          fi
+
+          registry="$(echo "$new_repo" | awk -F/ '{print $1}')"
+
+          {
+            echo "changed=$([ "$old_tag" != "$new_tag" ] && echo true || echo false)"
+            echo "new_image=$new_image"
+            echo "new_repo=$new_repo"
+            echo "new_tag=$new_tag"
+            echo "registry=$registry"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Skip if tag unchanged
+        if: steps.img.outputs.changed != 'true'
+        run: echo "Workload image tag unchanged in ${{ env.DEPLOY_FILE }}; skipping build."
+
+      - name: Set up Buildx
+        if: steps.img.outputs.changed == 'true'
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to registry
+        if: steps.img.outputs.changed == 'true'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ steps.img.outputs.registry }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: Build and push (exact tag from deployment)
+        if: steps.img.outputs.changed == 'true'
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ steps.img.outputs.new_image }}
+            ${{ steps.img.outputs.new_repo }}:latest
+          labels: |
+            org.opencontainers.image.source=${{ gitea.repository }}
+            org.opencontainers.image.revision=${{ gitea.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+

.gitignore

@@ -9,10 +9,9 @@ keys/
 .venv/
 .idea/
 *.kate-swp
+media/diagram_cache/
+.env
 node_modules/
 package-lock.json
 package.json
-# Diagram cache directory
-media/diagram_cache/
-.env
 data/db.sqlite3

README.md

@@ -2,5 +2,8 @@
 
 There are examples for importing text in the "Documentation"-directory. Actual documentation follows.
 
+<<<<<<< HEAD
 Documentation on Confluence so far.
 This commit should be signed.
+=======
+>>>>>>> 299c046 (Readme added)

argocd/deployment.yaml

@@ -25,7 +25,7 @@ spec:
               mountPath: /data
       containers:
         - name: web
-          image: git.baumann.gr/adebaumann/vui:0.949-test
+          image: git.baumann.gr/adebaumann/vui:0.945
           imagePullPolicy: Always
           ports:
             - containerPort: 8000

dokumente/admin.py

@@ -191,7 +191,6 @@ class PersonAdmin(admin.ModelAdmin):
         js = ['admin/js/jquery.init.js', 'custom/js/inline_toggle.js']
         css = {'all': ['custom/css/admin_extras.css']}
     list_display=['name']
-    ordering = ['name']
     
 
 

dokumente/models.py

@@ -26,7 +26,6 @@ class Person(models.Model):
         return self.name
     class Meta:
         verbose_name_plural="Personen"
-        ordering = ['name']
 
 class Thema(models.Model):
     name = models.CharField(max_length=100, primary_key=True)

pages/templates/base.html

@@ -31,6 +31,6 @@
     <div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
     <div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
 </div>
-<div>VorgabenUI v0.949</div>
+<div>VorgabenUI v0.945</div>
 </body>
 </html>