Update isle_bagger from 0.0.6 to 0.0.7

cwrc · Jan 14, 2025 · e3e00d0 · e3e00d0
1 parent 023d466
commit e3e00d0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/anchore.yml b/.github/workflows/anchore.yml
@@ -19,6 +19,7 @@ on:
     branches: [ "main" ]
   schedule:
     - cron: '39 23 * * 1'
+  workflow_dispatch:
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -34,7 +35,7 @@ jobs:
   Anchore-Build-Scan:
     permissions:
       contents: read # for actions/checkout to fetch code
-      packages: read # read registries used by Dockerfile 
+      packages: read # read registries used by Dockerfile
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
       actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
 
@@ -53,7 +54,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag localbuild/testimage:latest
+      run: docker buildx bake --set "leaf-bagger.tags=localbuild/testimage:latest"
     - name: Run the Anchore Grype scan action
       uses: anchore/scan-action@3343887d815d7b07465f6fdcd395bd66508d486a #v3.6.4
       id: scan

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -2,7 +2,7 @@ variable "ISLE_BAGGER_REGISTRY" {
     default = "ghcr.io/cwrc"
     }
 variable "ISLE_BAGGER_VERSION" {
-    default = "v0.0.6@sha256:048c902f434d7947a4302dbb0d09941f792633ec21bfe0fc118cef7ca4db2ca3"
+    default = "v0.0.7@sha256:5b8b2826833993255c8cccd1124b109a0fda9e000a4d4a3726f744a7868c60d8"
     }
 
 ###############################################################################
@@ -22,6 +22,13 @@ target "common" {
 # have to declare an empty target named docker-metadata-action and inherit from it.
 target "docker-metadata-action" {}
 
+###############################################################################
+# Groups
+###############################################################################
+
+group "default" {
+  targets = ["leaf-bagger"]
+}
 
 ###############################################################################
 # Target.
@@ -37,5 +44,5 @@ target "leaf-bagger" {
     isle_bagger = "docker-image://${ISLE_BAGGER_REGISTRY}/isle-bagger:${ISLE_BAGGER_VERSION}"
     #isle_bagger = "docker-image://ISLE_BAGGER_REGISTRY}/drupal:${ISLE_BAGGER_VERSION}"
     #BAGGER_TAG = "v0.0.5@sha256:4e05219adb36595ddfc51fee33a35ead45fced6b01f57e157bcc01d2608a4aae"
-  } 
+  }
 }
diff --git a/docker-compose.bagger.yml b/docker-compose.bagger.yml
@@ -82,4 +82,4 @@ services:
     volumes:
       - ${LOCAL_AIP_DIR:-bagger-data}:${BAGGER_OUTPUT_DIR:-/var/www/bagger/var/output}
       - bagger-log:/var/www/bagger/var/log
-      - leaf-log:${LEAF_BAGGER_OUTPUT_DIR}
+      - leaf-log:${LEAF_BAGGER_OUTPUT_DIR:-/var/www/bagger/var/output}