.gitea/workflows/create_and_push_multiarch_container.yml aktualisiert

.gitea/workflows/create_and_push_multiarch_container.yml

@@ -1,13 +1,10 @@
 name: build-image
-run-name: build and push Docker-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.6.0'
 
 env:
   image_name_gitea: flask-qr
@@ -56,10 +53,37 @@ jobs:
           docker buildx build \
             --file ./Dockerfile \
             --platform linux/amd64,linux/386,linux/arm64,linux/arm/v7 \
-            --tag ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name_gitea }}:${{ github.event.inputs.image_tag }} \
+            --tag ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name_gitea }}:${{ github.ref_name }} \
-            --tag ${{ env.registry_github }}/${{ env.user }}/${{ env.image_name_github }}:${{ github.event.inputs.image_tag }} \
+            --tag ${{ env.registry_github }}/${{ env.user }}/${{ env.image_name_github }}:${{ github.ref_name }} \
-            --tag ${{ env.user }}/${{ env.image_name_dockerhub }}:${{ github.event.inputs.image_tag }} \
+            --tag ${{ env.user }}/${{ env.image_name_dockerhub }}:${{ github.ref_name }} \
             --tag ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name_gitea }}:latest \
             --tag ${{ env.registry_github }}/${{ env.user }}/${{ env.image_name_github }}:latest \
             --tag ${{ env.user }}/${{ env.image_name_dockerhub }}:latest \
             --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_gitea }}:${{ github.ref_name }}</b>
+        <i>$(date +"%Y-%m-%d  %T")</i>
+        Build of Image: <b><i>${{ env.image_name_gitea }}:${{ github.ref_name }}</i></b>
+        ${{ gitea.server_url }}/${{ gitea.repository }}
+        \"
+        }"
+        

.gitea/workflows/trivy_image_scan.yml

@@ -1,5 +1,5 @@
 name: trivy-scan-image
-run-name: Trivy - Scan Docker Image
+run-name: Trivy - Scan Docker Image ${{ env.image_tag }}
 
 on:
   workflow_dispatch: # Manuelles Auslösen des Workflows
@@ -22,13 +22,74 @@ jobs:
     runs-on: ubuntu-latest
     container: aquasec/trivy:latest
     steps:
-      - name: Scan image with trivy
+      - name: Scan linux/amd64-image
         run: |
           trivy image \
           --username ${{ env.user }} \
           --password ${{ secrets.DOCKER_PULL_TOKEN }} \
           --exit-code 1 \
           --scanners vuln,misconfig,secret \
-          --severity MEDIUM,HIGH,CRITICAL \
+          --severity HIGH,CRITICAL \
           --ignore-unfixed \
+          --platform linux/amd64 \
           ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name_gitea }}:${{ env.image_tag }}
+      - name: Scan linux/386-image
+        run: |
+          trivy image \
+          --username ${{ env.user }} \
+          --password ${{ secrets.DOCKER_PULL_TOKEN }} \
+          --exit-code 1 \
+          --scanners vuln,misconfig,secret \
+          --severity HIGH,CRITICAL \
+          --ignore-unfixed \
+          --platform linux/386 \
+          ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name_gitea }}:${{ env.image_tag }}
+      - name: Scan linux/arm64-image
+        run: |
+          trivy image \
+          --username ${{ env.user }} \
+          --password ${{ secrets.DOCKER_PULL_TOKEN }} \
+          --exit-code 1 \
+          --scanners vuln,misconfig,secret \
+          --severity HIGH,CRITICAL \
+          --ignore-unfixed \
+          --platform linux/arm64 \
+          ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name_gitea }}:${{ env.image_tag }}
+      - name: Scan linux/arm/v7-image
+        run: |
+          trivy image \
+          --username ${{ env.user }} \
+          --password ${{ secrets.DOCKER_PULL_TOKEN }} \
+          --exit-code 1 \
+          --scanners vuln,misconfig,secret \
+          --severity HIGH,CRITICAL \
+          --ignore-unfixed \
+          --platform linux/arm/v7 \
+          ${{ env.registry_gitea }}/${{ env.user }}/${{ env.image_name_gitea }}:${{ 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_gitea }}:${{ env.image_tag }}</b>
+        <i>$(date +"%Y-%m-%d  %T")</i>
+        Trivy-Image-Scan of: <b><i>${{ env.image_name_gitea }}:${{ env.image_tag }}</i></b>
+        ${{ gitea.server_url }}/${{ gitea.repository }}
+        \"
+        }"

Dockerfile

@@ -9,6 +9,7 @@ ENV PYTHONUNBUFFERED=1
 ENV HTTP_METHOD=POST
 
 RUN apt-get update && \
+    apt-get upgrade -y &&\
     if [ "$TARGETPLATFORM" = "linux/arm/v7" ] || [ "$TARGETPLATFORM" = "linux/386" ]; then \
         apt-get install -y --no-install-recommends zlib1g-dev libjpeg-dev gcc; \
     fi && \