From 7690a2f4f65406f2e6e062fffdb32b6407704923 Mon Sep 17 00:00:00 2001 From: cyc60 Date: Tue, 19 Nov 2024 17:40:30 +0300 Subject: [PATCH 1/4] Restore CI docker cache Signed-off-by: cyc60 --- .github/workflows/docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 62817440..b0a68e06 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -43,8 +43,8 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64 -# cache-from: type=gha -# cache-to: type=gha,mode=max + cache-from: type=gha + cache-to: type=gha,mode=max scanner: name: Trivy scanner runs-on: ubuntu-latest From 60e1fad9a7dca09311afb02b703a9e63259dcc23 Mon Sep 17 00:00:00 2001 From: cyc60 Date: Tue, 19 Nov 2024 17:59:24 +0300 Subject: [PATCH 2/4] Update CI docker cache Signed-off-by: cyc60 --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index b0a68e06..2b0c9b72 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -44,7 +44,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64 cache-from: type=gha - cache-to: type=gha,mode=max + cache-to: type=gha,mode=min scanner: name: Trivy scanner runs-on: ubuntu-latest From 9aee6ea1282cdeae3ad35b6d43e90373048f6c99 Mon Sep 17 00:00:00 2001 From: cyc60 Date: Tue, 19 Nov 2024 18:11:59 +0300 Subject: [PATCH 3/4] Set docker image digest Signed-off-by: cyc60 --- .github/workflows/docker.yaml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 2b0c9b72..b0a68e06 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -44,7 +44,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64 cache-from: type=gha - cache-to: type=gha,mode=min + cache-to: type=gha,mode=max scanner: name: Trivy scanner runs-on: ubuntu-latest diff --git a/Dockerfile b/Dockerfile index 18f9ed38..4417be36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # `python-base` sets up all our shared environment variables -FROM python:3.10.14-slim-bookworm as python-base +FROM python:3.10.14-slim-bookworm@sha256:2407c61b1a18067393fecd8a22cf6fceede893b6aaca817bf9fbfe65e33614a3 as python-base # python ENV PYTHONUNBUFFERED=1 \ From 763ece9f045c65063dde792f8fa9ea9e88ec7b73 Mon Sep 17 00:00:00 2001 From: cyc60 Date: Tue, 19 Nov 2024 18:17:24 +0300 Subject: [PATCH 4/4] Update base docker image Signed-off-by: cyc60 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4417be36..62b5b01f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # `python-base` sets up all our shared environment variables -FROM python:3.10.14-slim-bookworm@sha256:2407c61b1a18067393fecd8a22cf6fceede893b6aaca817bf9fbfe65e33614a3 as python-base +FROM python:3.10.15-slim-bookworm as python-base # python ENV PYTHONUNBUFFERED=1 \