From f484b030aa99f51d25343b0f20223da412556df7 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Wed, 1 Oct 2025 15:59:05 +0200 Subject: [PATCH 1/3] chore: update Dockerfile and debian.yaml to use Debian Trixie version --- dockerfiles/agent-discovery/Dockerfile | 4 ++-- dockerfiles/sidekick/Dockerfile | 4 ++-- updatecli/updatecli.d/debian.yaml | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dockerfiles/agent-discovery/Dockerfile b/dockerfiles/agent-discovery/Dockerfile index 822aee33..f6dc3644 100644 --- a/dockerfiles/agent-discovery/Dockerfile +++ b/dockerfiles/agent-discovery/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed. -# We start from the Debian 'bookworm' image dated 2023-11-20. -FROM debian:bookworm-20250908-slim as prepare-stage +# We start from the Debian 'trixie' image. +FROM debian:trixie-20250610-slim as prepare-stage # Copy all shell scripts from the current directory to /usr/local/bin/ in the image. COPY *sh /usr/local/bin/ diff --git a/dockerfiles/sidekick/Dockerfile b/dockerfiles/sidekick/Dockerfile index b0de42fa..fadc7b4d 100644 --- a/dockerfiles/sidekick/Dockerfile +++ b/dockerfiles/sidekick/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed. -# We start from the Debian 'bookworm' image dated 2023-11-20. -FROM debian:bookworm-20250929 as prepare-stage +# We start from the Debian 'trixie' image. +FROM debian:trixie-20250610 as prepare-stage # Copy all shell scripts from the current directory to /usr/local/bin/ in the image. COPY *sh /usr/local/bin/ diff --git a/updatecli/updatecli.d/debian.yaml b/updatecli/updatecli.d/debian.yaml index 11a56812..ade46173 100644 --- a/updatecli/updatecli.d/debian.yaml +++ b/updatecli/updatecli.d/debian.yaml @@ -13,16 +13,16 @@ scms: branch: "{{ .github.branch }}" sources: - bookwormLatestVersion: + trixieLatestVersion: kind: dockerimage - name: "Get the latest Debian Bookworm Linux version" + name: "Get the latest Debian Trixie Linux version" spec: image: "debian" - tagfilter: "bookworm-*" + tagfilter: "trixie-*" versionfilter: kind: regex pattern: >- - bookworm-\d+$ + trixie-\d+$ targets: debian: @@ -34,14 +34,14 @@ targets: instruction: keyword: FROM matcher: debian - sourceid: bookwormLatestVersion + sourceid: trixieLatestVersion actions: default: kind: github/pullrequest scmid: default - title: Bump Debian Bookworm Linux version to {{ source "bookwormLatestVersion" }} + title: Bump Debian Trixie Linux version to {{ source "trixieLatestVersion" }} spec: labels: - dependencies - - debian-bookworm + - debian-trixie From e3802222e64a7e1ea9c688c497e297115787838e Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Wed, 1 Oct 2025 16:06:08 +0200 Subject: [PATCH 2/3] chore: update Dockerfile to use Debian Trixie version 20250929 --- dockerfiles/agent-discovery/Dockerfile | 2 +- dockerfiles/sidekick/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/agent-discovery/Dockerfile b/dockerfiles/agent-discovery/Dockerfile index f6dc3644..d1cbe7aa 100644 --- a/dockerfiles/agent-discovery/Dockerfile +++ b/dockerfiles/agent-discovery/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed. # We start from the Debian 'trixie' image. -FROM debian:trixie-20250610-slim as prepare-stage +FROM debian:trixie-20250929-slim as prepare-stage # Copy all shell scripts from the current directory to /usr/local/bin/ in the image. COPY *sh /usr/local/bin/ diff --git a/dockerfiles/sidekick/Dockerfile b/dockerfiles/sidekick/Dockerfile index fadc7b4d..5dba729f 100644 --- a/dockerfiles/sidekick/Dockerfile +++ b/dockerfiles/sidekick/Dockerfile @@ -1,7 +1,7 @@ # This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed. # We start from the Debian 'trixie' image. -FROM debian:trixie-20250610 as prepare-stage +FROM debian:trixie-20250929 as prepare-stage # Copy all shell scripts from the current directory to /usr/local/bin/ in the image. COPY *sh /usr/local/bin/ From 35db12ee0b18096b34df02925f4427a61df131f6 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Wed, 1 Oct 2025 16:11:16 +0200 Subject: [PATCH 3/3] chore: enhance GitHub Actions workflow to check for forked PRs --- .github/workflows/github-docker-registry-push.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-docker-registry-push.yml b/.github/workflows/github-docker-registry-push.yml index 4784cd41..eb953e42 100644 --- a/.github/workflows/github-docker-registry-push.yml +++ b/.github/workflows/github-docker-registry-push.yml @@ -22,7 +22,16 @@ jobs: steps: - name: Check if PR is from a fork # This step checks if the pull request is from a fork - run: echo "IS_FORK=$(if [ '${{ github.event.pull_request.head.repo.full_name }}' != '${{ github.repository }}' ]; then echo 'true'; else echo 'false'; fi)" >> $GITHUB_ENV + run: | + if [ "${{ github.event_name }}" = "pull_request" ]; then + if [ '${{ github.event.pull_request.head.repo.full_name }}' != '${{ github.repository }}' ]; then + echo "IS_FORK=true" >> $GITHUB_ENV + else + echo "IS_FORK=false" >> $GITHUB_ENV + fi + else + echo "IS_FORK=false" >> $GITHUB_ENV + fi - name: Checkout # This step checks out the repository