diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31db683abd..76a464305f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,8 +169,6 @@ jobs: version: "3.23" - image: "alpine" version: "3.24" - - image: "debian" - version: "bullseye-slim" - image: "debian" version: "bookworm-slim" steps: diff --git a/Makefile b/Makefile index 00a3f3d3b8..c41fec2c3b 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ GOTIDY = ${GOMOD} tidy # | ---------------- | ----------------------------------------- | -------------------------------------------------------------- | # | amazonlinux | 2, 2023 | | # | ubuntu | 22.04, 24.04 25.04, 25.10 26.04 | | -# | debian | bullseye-slim, bookworm-slim, trixie-slim | | +# | debian | bookworm-slim, trixie-slim | bullseye EOL 2026-08-31, removed 2026-09 | # | redhatenterprise | 8, 9, 10 | | # | rockylinux | 8, 9, 10 | | # | almalinux | 8, 9, 10 | | diff --git a/scripts/packages/packager/Dockerfile b/scripts/packages/packager/Dockerfile index 8f3baa060c..847f6d7821 100644 --- a/scripts/packages/packager/Dockerfile +++ b/scripts/packages/packager/Dockerfile @@ -1,13 +1,13 @@ ARG package_type -FROM docker.io/golang:1.24-bullseye AS base +FROM docker.io/golang:1.24-bookworm AS base ARG PKG_VER="1.17.5" ARG PKG_DIR="/tmp/pkg" RUN apt-get update && \ - apt-get install -y make jq gnupg gnupg1 gpgv1 git aptly debsig-verify createrepo-c dnf rpm \ - curl gettext-base make monkeysphere libtool unzip libssl-dev libbz2-dev libbsd-dev libarchive-dev liblzma-dev zlib1g-dev + apt-get install -y make jq gnupg git aptly debsig-verify createrepo-c dnf rpm \ + curl gettext-base libtool unzip libssl-dev libbz2-dev libbsd-dev libarchive-dev liblzma-dev zlib1g-dev # compile, install pkg tool for linux RUN mkdir $PKG_DIR; cd $PKG_DIR; \