add all Platforms, fix for trivy

Knight1 · Oct 18, 2024 · 574b779 · 574b779
1 parent 57c6795
commit 574b779
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -47,7 +47,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          platforms: all
           push: true
           tags: |
             knight/cloudflared-dns:latest

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -20,25 +20,25 @@ jobs:
 
       - name: Build an image from Dockerfile
         run: |
-          docker build -t visibilityspots/cloudflared:dev .
+          docker build -t knight/cloudflared-dev:dev .
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.24.0
+        uses: aquasecurity/trivy-action@0.28.0
         with:
-          image-ref: 'Knight1/cloudflared:dev'
+          image-ref: 'knight/cloudflared-dev:dev'
           format: 'table'
           exit-code: 0
           ignore-unfixed: true
-          severity: 'CRITICAL,HIGH'
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.24.0
+        uses: aquasecurity/trivy-action@0.28.0
         with:
-          image-ref: 'Knight1/cloudflared:dev'
+          image-ref: 'knight/cloudflared-dev:dev'
           format: 'sarif'
           output: 'trivy-results.sarif'
           ignore-unfixed: true
-          severity: 'CRITICAL,HIGH'
+          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
 
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v3

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,14 +3,14 @@ version: "2"
 
 services:
   cloudflared:
-    image: Knight1/cloudflared
+    image: knight1/cloudflared-dns
     container_name: cloudflared
     ports:
       - "54:53/tcp"
       - "54:53/udp"
     environment:
         TZ: ${TIMEZONE}
-        PORT: 54
+        PORT: 53
         ADDRESS: 0.0.0.0
     restart: always
     networks: