.gitea/workflows/create_and_push_multiarch_container.yml aktualisiert

agt-get upgrade in Dockerfile

.gitea/workflows/create_and_push_multiarch_container.yml

@@ -1,12 +1,10 @@
-name: release-tag
+name: build-image
+run-name: build and push Docker-Image with tag:${{ github.ref_name }}
 
 on:
-  workflow_dispatch: # Manuelles Auslösen des Workflows
+  push:
-    inputs:
+    tags:
-      image_tag:
+      - "*"
-        description: '2. Tag für das Docker-Image (außer latest) (z.B. v1.0.0)'
-        required: true
-        default: '1.0.0'
 
 env:
   image_name: mysteryhelfer
@@ -15,7 +13,7 @@ env:
 
 jobs:
   release-image:
-    runs-on: ubuntu-latest
+    runs-on: build-ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -46,7 +44,34 @@ jobs:
             --file ./Dockerfile \
             --platform linux/amd64,linux/arm64 \
             --tag ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name }}:latest \
-            --tag ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name }}:${{ github.event.inputs.image_tag }} \
+            --tag ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name }}:${{ github.ref_name }} \
             --tag ${{ env.user }}/${{ env.image_name }}:latest \
-            --tag ${{ env.user }}/${{ env.image_name }}:${{ github.event.inputs.image_tag }} \
+            --tag ${{ env.user }}/${{ env.image_name }}:${{ github.ref_name }} \
             --push ./
+  telegram-notify:
+    needs: release-image
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+    - name: Telegram Alert
+      run: |
+        case "${{ needs.release-image.result }}" in
+            "success")  EMOJI="✅"; MSG="OK" ;;
+            "failure")  EMOJI="❌"; MSG="WARN!" ;;
+            "cancelled") EMOJI="⏹️"; MSG="Canceled" ;;
+            *) EMOJI="❓"; MSG="Unknown-State: ${{ needs.release-image.result }}" ;;
+        esac
+        
+        curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
+        -H 'Content-Type: application/json' \
+        -d "{
+        \"chat_id\": \"${{ secrets.TELEGRAM_CHAT_ID }}\",
+        \"parse_mode\": \"HTML\",
+        \"text\": 
+        \"$EMOJI <b>$MSG - Build ${{ env.image_name }}:${{ github.ref_name }}</b>
+        <i>$(date +"%Y-%m-%d  %T")</i>
+        Build of Image: <b><i>${{ env.image_name }}:${{ github.ref_name }}</i></b>
+        ${{ gitea.server_url }}/${{ gitea.repository }}
+        \"
+        }"
+        

.gitea/workflows/trivy_image_scan.yml

@@ -1,4 +1,5 @@
-name: release-tag
+name: trivy-scan-image
+run-name: Trivy - Scan Docker Image
 
 on:
   workflow_dispatch: # Manuelles Auslösen des Workflows
@@ -7,9 +8,12 @@ on:
         description: 'Tag für das zu scannende Docker-Image z.B. latest'
         required: true
         default: 'latest'
+  schedule:
+    - cron: '45 1 * * 5'
 
 env:
   image_name: mysteryhelfer
+  image_tag: ${{ github.event.inputs.image_tag || 'latest' }}
   registry_gitea: gitea.tebarius.duckdns.org
   user: tebarius
 
@@ -18,11 +22,48 @@ jobs:
     runs-on: ubuntu-latest
     container: aquasec/trivy:latest
     steps:
-      - name: Scan image with trivy
+      - name: Scan linux/amd64-image
         run: |
           trivy image \
           --exit-code 1 \
           --scanners vuln,misconfig,secret \
-          --severity MEDIUM,HIGH,CRITICAL \
+          --severity HIGH,CRITICAL \
           --ignore-unfixed \
-          ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name }}:${{ github.event.inputs.image_tag }}
+          --platform linux/amd64 \
+          ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name }}:${{ env.image_tag }}
+      - name: Scan linux/arm64-image
+        run: |
+          trivy image \
+          --exit-code 1 \
+          --scanners vuln,misconfig,secret \
+          --severity HIGH,CRITICAL \
+          --ignore-unfixed \
+          --platform linux/arm64 \
+          ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name }}:${{ env.image_tag }}
+
+  telegram-notify:
+    needs: trivy_image_scan
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+    - name: Telegram Alert
+      run: |
+        case "${{ needs.trivy_image_scan.result }}" in
+            "success")  EMOJI="✅"; MSG="OK" ;;
+            "failure")  EMOJI="❌"; MSG="WARN!" ;;
+            "cancelled") EMOJI="⏹️"; MSG="Canceled" ;;
+            *) EMOJI="❓"; MSG="Unknown-State: ${{ needs.trivy_image_scan.result }}" ;;
+        esac
+        
+        curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
+        -H 'Content-Type: application/json' \
+        -d "{
+        \"chat_id\": \"${{ secrets.TELEGRAM_CHAT_ID }}\",
+        \"parse_mode\": \"HTML\",
+        \"text\": 
+        \"$EMOJI <b>$MSG - Scan ${{ env.image_name }}:${{ env.image_tag }}</b>
+        <i>$(date +"%Y-%m-%d  %T")</i>
+        Trivy-Image-Scan of: <b><i>${{ env.image_name }}:${{ env.image_tag }}</i></b>
+        ${{ gitea.server_url }}/${{ gitea.repository }}
+        \"
+        }"

Dockerfile

@@ -1,16 +1,14 @@
 # Copyright (c) 2025 Martin Kayser (tebarius)
 # Licensed under the MIT License. See LICENSE file in the project root.
-ARG PYTHON_VERSION="3.14"
+FROM python:3.14-slim
-FROM python:${PYTHON_VERSION}-slim
 LABEL authors="tebarius"
 LABEL description="tebarius Mysteryhelfer web"
 
-ARG PYTHON_VERSION
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
-ENV PATH="/myst-venv/bin:$PATH"
 
 RUN apt-get update \
+    && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends curl \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
@@ -18,17 +16,16 @@ RUN apt-get update \
 WORKDIR /app
 COPY requirements.txt .
 
-RUN python -m venv /myst-venv \
+RUN python -m pip install --upgrade pip \
-    && python -m pip install --upgrade pip \
     && pip install --no-cache-dir -r requirements.txt
 
 COPY ./app /app
 # ein bisschen Patchen um auch beim Bookmarken oder Versenden der Webadresse per Messenger den richtigen Titel und das
 # richtige Favicon zu verwenden/sehen
-COPY ./app/images/favicon.ico /myst-venv/lib/python${PYTHON_VERSION}/site-packages/streamlit/static/favicon.ico
+COPY ./app/images/favicon.ico /usr/local/lib/python3.14/site-packages/streamlit/static/favicon.ico
 RUN sed -i -e 's|favicon\.png|favicon.ico|' \
         -e 's|<title>.*</title>|<title>tebarius Mysteryhelfer (web)</title>|' \
-        /myst-venv/lib/python${PYTHON_VERSION}/site-packages/streamlit/static/index.html \
+        /usr/local/lib/python3.14/site-packages/streamlit/static/index.html \
     && useradd -m -u 1000 myst \
     && chown -R myst:myst /app
 USER myst