From cafc3af5d44aef1412b76dfffeef14442b42c3f4 Mon Sep 17 00:00:00 2001 From: romeroalx Date: Thu, 6 Jun 2024 15:37:44 +0200 Subject: [PATCH 1/2] Use python:3.11-bullseye as base for debian 11 builds --- .github/workflows/build-debian-images.yaml | 9 ++++++--- Dockerfile | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-debian-images.yaml b/.github/workflows/build-debian-images.yaml index 4b997b0..bdfb927 100644 --- a/.github/workflows/build-debian-images.yaml +++ b/.github/workflows/build-debian-images.yaml @@ -17,9 +17,11 @@ jobs: - rel/dnsdist-1.9.x image: - id: debian-11-pdns-base - debian-release: bullseye-slim + debian-image-name: python + debian-image-tag: 3.11-bullseye - id: debian-12-pdns-base - debian-release: bookworm-slim + debian-image-name: debian + debian-image-tag: bookworm-slim fail-fast: false runs-on: ubuntu-22.04 permissions: @@ -36,7 +38,8 @@ jobs: run: | docker build . --file Dockerfile \ --tag ${{ env.image-id-lowercase }}:${{ env.image-tag }} \ - --build-arg DEBIAN_IMAGE_TAG=${{ matrix.image.debian-release }} \ + --build-arg DEBIAN_IMAGE_NAME=${{ matrix.image.debian-image-name }} \ + --build-arg DEBIAN_IMAGE_TAG=${{ matrix.image.debian-image-tag }} \ --build-arg REPO_BRANCH=${{ matrix.branch-name }} - name: Login to GitHub Container Registry diff --git a/Dockerfile b/Dockerfile index e206222..7ff94d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ +ARG DEBIAN_IMAGE_NAME ARG DEBIAN_IMAGE_TAG -FROM debian:${DEBIAN_IMAGE_TAG} +FROM ${DEBIAN_IMAGE_NAME}:${DEBIAN_IMAGE_TAG} ARG REPO_HOME=/home/runner ARG REPO_BRANCH=master From d6111a5e9c3fd579d836d8a7ff966476d36633aa Mon Sep 17 00:00:00 2001 From: romeroalx Date: Fri, 7 Jun 2024 12:06:53 +0200 Subject: [PATCH 2/2] use 3.11-slim-bullseye instead of 3.11-bullseye as suggested by @rgacogne --- .github/workflows/build-debian-images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-debian-images.yaml b/.github/workflows/build-debian-images.yaml index bdfb927..3e3feb8 100644 --- a/.github/workflows/build-debian-images.yaml +++ b/.github/workflows/build-debian-images.yaml @@ -18,7 +18,7 @@ jobs: image: - id: debian-11-pdns-base debian-image-name: python - debian-image-tag: 3.11-bullseye + debian-image-tag: 3.11-slim-bullseye - id: debian-12-pdns-base debian-image-name: debian debian-image-tag: bookworm-slim