Update docker-build.yml

Signed-off-by: Marcin Kozlowski <[email protected]>
tcosolutions · Dec 28, 2024 · 27ee400 · 27ee400
1 parent 5fe4d97
commit 27ee400
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -19,13 +19,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        service: [worker-cli]
+
+        service: [worker-cli, server, worker]
         include:
+          - service: server
+            dockerfile: docker/docker/server/Dockerfile
+            context: docker/docker/server
+            component: server
+          - service: worker
+            dockerfile: docker/docker/worker/Dockerfile
+            context: docker/docker/worker
+            component: worker
           - service: worker-cli
             dockerfile: docker/docker/worker-cli/Dockerfile
             context: docker/docker/worker-cli
             component: worker-cli
 
+
     env:
       REGISTRY: docker.io
       IMAGE_NAME: tcosolutions/betterscan-${{ matrix.component }}
@@ -74,14 +84,14 @@ jobs:
       # Generate SBOM with Grype
       - name: Generate SBOM with Grype
         run: |   
-          grype ${{ env.IMAGE_NAME }}:${{ github.sha }} -o cyclonedx-json > sbom.cyclonedx.json    
+          grype ${{ env.IMAGE_NAME }}:${{ github.sha }} -o spdx-json > sbom.spdx.json    
     
       - name: Generate SBOM attestation
         uses: actions/[email protected]
         with:
           subject-name: docker.io/${{ secrets.DOCKERHUB_USERNAME }}/betterscan-${{ matrix.component }}
           subject-digest: ${{ steps.build-push.outputs.digest }}
-          sbom-path: 'sbom.cyclonedx.json'
+          sbom-path: 'sbom.spdx.json'
           push-to-registry: true
         env:
           DOCKER_HUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}