removed vulnscan

.gitea/workflows/build_and_publish.yaml

@@ -7,10 +7,8 @@ env:
 
 on:
   push:
-    tags:
-      - '*'
   schedule:
-    - cron: "0 12 3 * *"
+    - cron: "0 12 * * 3"
   workflow_dispatch:
   workflow_call:
   workflow_run:
@@ -32,9 +30,9 @@ jobs:
       image: catthehacker/ubuntu:act-latest
     strategy:
       matrix:
-        arch: [amd64, arm64]
+        arch: [amd64]
         flavour: [sqlite3, mysql]
-        ver: ["6.0", "7.0"]
+        ver: ["7.0"]
 
 
     steps:
@@ -50,7 +48,7 @@ jobs:
       - name: Build and publish
         run: |
           docker build \
-            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-${{ matrix.arch }} \
+            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}-${{ matrix.flavour }}-mssql:${{ matrix.ver }}-${{ matrix.arch }} \
             --build-arg UPSTREAM_FLAVOUR=${{ matrix.flavour }} \
             --build-arg UPSTREAM_VERSION=${{ matrix.ver }} \
             --platform linux/${{ matrix.arch }} -f src/Dockerfile-${{ matrix.ver }} .
@@ -62,6 +60,11 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        arch: [amd64]
+        flavour: [sqlite3, mysql]
+        ver: ["7.0"]
 
     steps:
       - name: Login to registry
@@ -75,6 +78,5 @@ jobs:
         run: |
           docker manifest create \
             ${{ env.REGISTRY }}/${{ env.REPOSITORY }}-${{ matrix.flavour }}-mssql:${{ matrix.ver }} \
-            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}-${{ matrix.flavour }}-mssql:${{ matrix.ver }}-amd64 \
-            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}-${{ matrix.flavour }}-mssql:${{ matrix.ver }}-arm64
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}-${{ matrix.flavour }}-mssql:${{ matrix.ver }}-amd64
           docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}-${{ matrix.flavour }}-mssql:${{ matrix.ver }}

.gitea/workflows/vulnscan.yaml

@@ -6,8 +6,6 @@ env:
   REPOSITORY: paspo/zabbix-proxy
 
 on:
-  schedule:
-    - cron: "0 14 * * *"
   workflow_dispatch:
   workflow_call:
   workflow_run:
@@ -23,9 +21,9 @@ jobs:
       image: catthehacker/ubuntu:act-latest
     strategy:
       matrix:
-        arch: [amd64, arm64]
+        arch: [amd64]
         flavour: [sqlite3, mysql]
-        ver: ["6.0", "7.0"]
+        ver: ["7.0"]
 
     steps:
       - name: Pull docker image
@@ -63,4 +61,4 @@ jobs:
           token: ${{ secrets.TELEGRAM_TOKEN }}
           format: markdown
           message: |
-            Found **${{ steps.vulncount.outputs.VULNCOUNT }}** vulnerabilities in `${{ github.repository }}`
+            Found **${{ steps.vulncount.outputs.VULNCOUNT }}** vulnerabilities in `${{ env.REGISTRY }}/${{ env.REPOSITORY }}-${{ matrix.flavour }}-mssql:${{ matrix.ver }}`

README.md

@@ -18,7 +18,6 @@ These are the supported upstream versions:
 | version |
 |---------|
 | 7.0     |
-| 6.0     |
 
 You can use the desired version as image tag (e.g. `docker.asperti.com/paspo/zabbix-proxy-sqlite3-mssql:7.0`), the correct arch will be used.
 If you prefer, you can also pin to a specific architecture: `docker.asperti.com/paspo/zabbix-proxy-sqlite3-mssql:7.0-amd64`.

src/Dockerfile-7.0

@@ -11,7 +11,7 @@ RUN \
   DEBIAN_FRONTEND=noninteractive apt install -y /tmp/a.deb && \
   rm /tmp/a.deb && \
   DEBIAN_FRONTEND=noninteractive apt update && \
-  DEBIAN_FRONTEND=noninteractive apt upgrade -y && \
+  DEBIAN_FRONTEND=noninteractive apt upgrade -y -o Dpkg::Options::="--force-confnew" && \
   DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt install -y msodbcsql18 mssql-tools18 && \
   DEBIAN_FRONTEND=noninteractive apt-get clean