From 4f49fb3e6e686c06da571564ff83d7df1aca4e7c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 May 2025 19:00:55 +0000 Subject: [PATCH 1/2] Update ubuntu Docker tag to noble-20250415.1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4b9729..76cdb57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:noble-20250404 AS init +FROM ubuntu:noble-20250415.1 AS init ENV WORKDIR=/app WORKDIR ${WORKDIR} @@ -113,7 +113,7 @@ COPY --from=builder ${WORKDIR}/build ${WORKDIR}/ CMD ["make", "test"] -FROM ubuntu:noble-20250404 AS production +FROM ubuntu:noble-20250415.1 AS production ENV LOG_LEVEL=INFO ENV BRUTEFORCE=false From 2959b9101f3ccff673dee508c255b0e6f47097a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 May 2025 19:00:55 +0000 Subject: [PATCH 2/2] [CONFIG] [Github Actions] Docker platforms. --- .github/workflows/docker-image.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a1baeb0..3ea6726 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,5 +1,4 @@ --- - name: Docker Image CI on: # yamllint disable-line rule:truthy @@ -15,7 +14,6 @@ env: ARTIFACT_NAME: algorithm-exercises-c_${{ github.sha }} jobs: - build: name: "Build Docker images" runs-on: ubuntu-24.04 @@ -24,6 +22,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + platforms: linux/amd64 # ,linux/arm64 - name: "LINT: Build and push" uses: docker/build-push-action@v6 @@ -34,6 +34,7 @@ jobs: type=docker,dest=/tmp/${{ env.ARTIFACT_NAME }}_lint.tar tags: | ${{ env.IMAGE_NAME }}:lint + platforms: linux/amd64 # ,linux/arm64 - name: "LINT: Upload artifact" uses: actions/upload-artifact@v4 with: @@ -167,7 +168,7 @@ jobs: - name: Upload result to GitHub Code Scanning uses: github/codeql-action/upload-sarif@v3 with: - sarif_file: 'snyk.sarif' + sarif_file: "snyk.sarif" scan: name: "Trivy" runs-on: ubuntu-24.04 @@ -192,7 +193,7 @@ jobs: uses: aquasecurity/trivy-action@0.30.0 with: image-ref: ${{ env.IMAGE_NAME }}:${{ github.sha }} - format: 'table' + format: "table" env: TRIVY_DB_REPOSITORY: ${{ vars.TRIVY_DB_REPOSITORY }} @@ -200,12 +201,12 @@ jobs: uses: aquasecurity/trivy-action@0.30.0 with: image-ref: ${{ env.IMAGE_NAME }}:${{ github.sha }} - format: 'sarif' - output: 'trivy-results.sarif' + format: "sarif" + output: "trivy-results.sarif" env: TRIVY_DB_REPOSITORY: ${{ vars.TRIVY_DB_REPOSITORY }} - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v3 with: - sarif_file: 'trivy-results.sarif' + sarif_file: "trivy-results.sarif"