From 7e9dfdea02618fc291a55aa763a45a78a9cff401 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 24 Jun 2026 14:29:29 +0200 Subject: [PATCH 1/2] docker: upgrade base images to debian:13 Debian 11 (Bullseye) LTS support ends on August 31, 2026. Upgrading to Debian 13 (Trixie) ensures long-term support until June 30, 2030. While upgrading: - Replace deprecated libncurses5-dev package with libncurses-dev. - Install gnupg explicitly as it is no longer pre-installed. - Add legacy-cgi to pip packages. Debian 13 comes with Python 3.13, which removed the standard cgi module. Buildbot 3.11.8 / Twisted requires cgi at startup, so legacy-cgi is required as a drop-in replacement. Signed-off-by: Josef Schlehofer --- docker/buildmaster/Dockerfile | 8 +++++--- docker/buildworker/Dockerfile | 9 ++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile index 9250e45..c8ea359 100644 --- a/docker/buildmaster/Dockerfile +++ b/docker/buildmaster/Dockerfile @@ -23,7 +23,7 @@ RUN git checkout $APK_TOOLS_COMMIT RUN make -j$(nproc) static -FROM debian:11 +FROM debian:13 LABEL maintainer="OpenWrt Maintainers" ARG DEBIAN_FRONTEND=noninteractive @@ -41,8 +41,9 @@ RUN \ build-essential \ gawk \ git-core \ + gnupg \ gosu \ - libncurses5-dev \ + libncurses-dev \ locales \ pv \ pwgen \ @@ -65,7 +66,8 @@ RUN \ "buildbot-grid-view==$BUILDBOT_VERSION" \ "buildbot-worker==$BUILDBOT_VERSION" \ pyOpenSSL \ - service_identity + service_identity \ + legacy-cgi RUN \ sed -i \ diff --git a/docker/buildworker/Dockerfile b/docker/buildworker/Dockerfile index 9263127..a6a46b2 100644 --- a/docker/buildworker/Dockerfile +++ b/docker/buildworker/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:11 +FROM debian:13 LABEL maintainer="OpenWrt Maintainers" ARG DEBIAN_FRONTEND=noninteractive @@ -24,10 +24,11 @@ RUN \ gcc-multilib \ genisoimage \ git-core \ + gnupg \ gosu \ libdw-dev \ libelf-dev \ - libncurses5-dev \ + libncurses-dev \ locales \ pv \ pwgen \ @@ -54,7 +55,9 @@ RUN pip3 install \ "buildbot-worker==$BUILDBOT_VERSION" \ pyelftools \ pyOpenSSL \ - service_identity + service_identity \ + legacy-cgi + ENV LANG=en_US.utf8 From 44286e075c4e7a117eb941788abd03507c353015 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Wed, 24 Jun 2026 14:29:37 +0200 Subject: [PATCH 2/2] docker: buildworker: install shfmt This is needed for formatting checks on package init scripts in openwrt-gh-action-sdk introduced by da3664e703cf27badd2c663858e5eb39a660201c ("run init scripts through shfmt") Signed-off-by: Josef Schlehofer --- docker/buildworker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/buildworker/Dockerfile b/docker/buildworker/Dockerfile index a6a46b2..f980e53 100644 --- a/docker/buildworker/Dockerfile +++ b/docker/buildworker/Dockerfile @@ -40,6 +40,7 @@ RUN \ qemu-utils \ rsync \ signify-openbsd \ + shfmt \ subversion \ swig \ unzip \