Merge branch 'main' into feature/pin-pip-dependencies

philips-software · Dec 7, 2023 · 84ff4e3 · 84ff4e3
2 parents 04d5ce2 + 952f743
commit 84ff4e3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -10,6 +10,8 @@ ARG XWIN_VERSION=0.5.0
 
 ARG DEBIAN_FRONTEND=noninteractive
 
+HEALTHCHECK NONE
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install the base system with all tool dependencies

diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -29,6 +29,6 @@ jobs:
           repo_token: ${{ secrets.SCORECARD_TOKEN }}
           publish_results: true
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
+        uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
         with:
           sarif_file: results.sarif
diff --git a/.trivyignore b/.trivyignore
@@ -1,7 +1,3 @@
 # See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/
 # We allow root access in our container that we use for development purposes
 DS002
-
-# See: https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0026/
-# We don't require a HEALTHCHECK for our devcontainer
-DS026