update so build and scan works

Author: duncanista

.github/workflows/vulnerability-scan.yml

@@ -14,6 +14,7 @@ env:
 
 jobs:
   trivy-scans:
+    name: Trivy Scans (latest)
     runs-on: ubuntu-22.04
     steps:
       - name: Scan latest released image with trivy
@@ -33,6 +34,7 @@ jobs:
           format: table
 
   grype-scans:
+    name: Grype Scans (latest)
     runs-on: ubuntu-22.04
     steps:
       - name: Scan latest release image with grype
@@ -54,6 +56,7 @@ jobs:
           output-format: table
 
   rust-dependency-scan:
+    name: Rust Dependencies Scan
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
@@ -66,20 +69,24 @@ jobs:
           working-directory: bottlecap
 
   build-and-scan-images:
+    name: Build and Scan Images
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
-          - arch: amd64
+          - name: amd64
+            arch: amd64
             alpine: 0
             suffix: amd64
-          - arch: amd64
+          - name: amd64-alpine
+            arch: amd64
             alpine: 1
             suffix: amd64-alpine
-          - arch: arm64
+          - name: arm64
             alpine: 0
             suffix: arm64
-          - arch: arm64
+          - name: arm64-alpine
+            arch: arm64
             alpine: 1
             suffix: arm64-alpine
       fail-fast: false
@@ -104,7 +111,7 @@ jobs:
 
       - name: Build layer (${{ matrix.suffix }})
         run: |
-          ARCHITECTURE=${{ matrix.arch }} FILE_SUFFIX=${{ matrix.suffix }} ./.gitlab/scripts/build_layer.sh
+          COMPRESSER_IMAGE=ubuntu:22.04 ARCHITECTURE=${{ matrix.arch }} FILE_SUFFIX=${{ matrix.suffix }} ./.gitlab/scripts/build_layer.sh
         env:
           DOCKER_BUILDKIT: 1
 

images/Dockerfile.build_layer

@@ -1,4 +1,5 @@
-FROM registry.ddbuild.io/images/mirror/ubuntu:22.04 AS compresser
+ARG COMPRESSER_IMAGE=registry.ddbuild.io/images/mirror/ubuntu:22.04
+FROM $COMPRESSER_IMAGE AS compresser
 ARG DATADOG_WRAPPER=datadog_wrapper
 ARG FILE_SUFFIX