From c1fbcb385accc0dbd6d263783513c6f0ef071be2 Mon Sep 17 00:00:00 2001 From: aimee-889 Date: Wed, 4 Dec 2024 15:28:38 +0100 Subject: [PATCH 1/2] add ldap-utils --- infra-tools/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/infra-tools/Dockerfile b/infra-tools/Dockerfile index 16ab41f..80706f0 100755 --- a/infra-tools/Dockerfile +++ b/infra-tools/Dockerfile @@ -47,6 +47,7 @@ RUN set -x \ gettext \ librsync-dev \ python3-pip \ + ldap-utils \ && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \ && apt-get install -y nodejs \ && apt-get clean -y \ From 32b21775762ed5aeef49521e80a1f421ab0788f9 Mon Sep 17 00:00:00 2001 From: aimee-889 Date: Wed, 4 Dec 2024 16:01:36 +0100 Subject: [PATCH 2/2] update version of gha --- .github/workflows/imagetoghcr-on-push.yaml | 2 +- .github/workflows/trivy-scan.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/imagetoghcr-on-push.yaml b/.github/workflows/imagetoghcr-on-push.yaml index 3f7273d..286b8b1 100644 --- a/.github/workflows/imagetoghcr-on-push.yaml +++ b/.github/workflows/imagetoghcr-on-push.yaml @@ -84,6 +84,6 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab if: ${{ always() }} - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@ece8414c725e29de2e18c0859fda9e7280df9488 with: sarif_file: 'trivy-results.sarif' diff --git a/.github/workflows/trivy-scan.yaml b/.github/workflows/trivy-scan.yaml index 409774e..9894dc1 100644 --- a/.github/workflows/trivy-scan.yaml +++ b/.github/workflows/trivy-scan.yaml @@ -33,7 +33,7 @@ jobs: ignore-unfixed: true - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@ece8414c725e29de2e18c0859fda9e7280df9488 if: always() with: sarif_file: 'trivy-results.sarif' \ No newline at end of file