From 40666746fe87a4d7c50447fbf3154148338ea598 Mon Sep 17 00:00:00 2001 From: Peter Deme Date: Thu, 15 Feb 2024 17:57:19 +0100 Subject: [PATCH] Bump to Alpine 3.19, and bump GH Action versions (#50) --- .github/workflows/publish/action.yml | 2 +- .github/workflows/publish_future.yml | 5 +++-- .github/workflows/trivy.yml | 2 +- Dockerfile | 2 +- docker-bake.hcl | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish/action.yml b/.github/workflows/publish/action.yml index 60ebae6..843b462 100644 --- a/.github/workflows/publish/action.yml +++ b/.github/workflows/publish/action.yml @@ -39,7 +39,7 @@ runs: role-duration-seconds: 900 - name: Login to Amazon ECR Public - uses: aws-actions/amazon-ecr-login@v1 + uses: aws-actions/amazon-ecr-login@v2 with: registry-type: public diff --git a/.github/workflows/publish_future.yml b/.github/workflows/publish_future.yml index b06dfc4..555efd7 100644 --- a/.github/workflows/publish_future.yml +++ b/.github/workflows/publish_future.yml @@ -16,9 +16,10 @@ jobs: steps: - name: Checkout publish workflow - uses: Bhacaz/checkout-files@v2 + uses: actions/checkout@main with: - files: .github/workflows/publish/action.yml + sparse-checkout: .github/workflows/publish/action.yml + sparse-checkout-cone-mode: false - name: Checkout repository code uses: actions/checkout@main diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 109aaff..9558f72 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -55,7 +55,7 @@ jobs: timeout: "10m" - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: "trivy-results.sarif" diff --git a/Dockerfile b/Dockerfile index ac71331..3601f12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.18 +ARG BASE_IMAGE=alpine:3.19 FROM ${BASE_IMAGE} AS base diff --git a/docker-bake.hcl b/docker-bake.hcl index 72e0a07..fbd9f8b 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,7 +1,7 @@ target "aws" { target = "aws" platforms = ["linux/amd64", "linux/arm64"] - args = {"BASE_IMAGE": "alpine:3.18"} + args = {"BASE_IMAGE": "alpine:3.19"} } target "gcp" {