From 783515c54f0a69124d3f937be9b3cf5e0c1587b5 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Tue, 2 Jun 2026 21:03:20 -0700 Subject: [PATCH 1/2] docker: Fix base image inconsistency in reprobuild for noble and resolute Switch `Dockerfile.noble` and `Dockerfile.resolute` to noble / resolute to match the debootstrap-based minimal image approach. --- contrib/reprobuild/Dockerfile.noble | 5 +++-- contrib/reprobuild/Dockerfile.resolute | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/reprobuild/Dockerfile.noble b/contrib/reprobuild/Dockerfile.noble index 8752d231811e..4ae8ba321e32 100644 --- a/contrib/reprobuild/Dockerfile.noble +++ b/contrib/reprobuild/Dockerfile.noble @@ -1,4 +1,4 @@ -FROM ubuntu:noble +FROM noble ENV TZ=UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -8,7 +8,8 @@ ENV PATH=/root/.pyenv/shims:/root/.pyenv/bin:/root/.cargo/bin:/root/.local/bin:$ ENV PROTOC_VERSION=29.4 RUN sed -i '/updates/d' /etc/apt/sources.list && \ - sed -i '/security/d' /etc/apt/sources.list + sed -i '/security/d' /etc/apt/sources.list && \ + sed -i 's/^deb \(.*\) noble main$/deb \1 noble main universe/' /etc/apt/sources.list RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/contrib/reprobuild/Dockerfile.resolute b/contrib/reprobuild/Dockerfile.resolute index 9c174f8cf265..2a103dd53a76 100644 --- a/contrib/reprobuild/Dockerfile.resolute +++ b/contrib/reprobuild/Dockerfile.resolute @@ -1,4 +1,4 @@ -FROM ubuntu:resolute +FROM resolute ENV TZ=UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -8,7 +8,8 @@ ENV PATH=/root/.pyenv/shims:/root/.pyenv/bin:/root/.cargo/bin:/root/.local/bin:$ ENV PROTOC_VERSION=29.4 RUN sed -i '/updates/d' /etc/apt/sources.list && \ - sed -i '/security/d' /etc/apt/sources.list + sed -i '/security/d' /etc/apt/sources.list && \ + sed -i 's/^deb \(.*\) resolute main$/deb \1 resolute main universe/' /etc/apt/sources.list RUN apt-get update \ && apt-get install -y --no-install-recommends \ From 49e1e9017898d15fe0c18960ed18508ea342f398 Mon Sep 17 00:00:00 2001 From: daywalker90 <8257956+daywalker90@users.noreply.github.com> Date: Thu, 4 Jun 2026 11:44:46 +0200 Subject: [PATCH 2/2] fixup! docker: Fix base image inconsistency in reprobuild for noble and resolute --- tools/repro-build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/repro-build.sh b/tools/repro-build.sh index eb18a54eb423..621847e71d13 100755 --- a/tools/repro-build.sh +++ b/tools/repro-build.sh @@ -107,13 +107,12 @@ EOF Ubuntu-24.04) cat > /tmp/SHASUMS <