Fix base image inconsistency in reprobuild for noble & resolute#9185
Open
ShahanaFarooqui wants to merge 1 commit into
Open
Fix base image inconsistency in reprobuild for noble & resolute#9185ShahanaFarooqui wants to merge 1 commit into
ShahanaFarooqui wants to merge 1 commit into
Conversation
Collaborator
|
I tried to run |
Lagrang3
approved these changes
Jun 3, 2026
Collaborator
|
Can we just add universe? It works for me after doing this: diff --git a/contrib/reprobuild/Dockerfile.noble b/contrib/reprobuild/Dockerfile.noble
index e938a9ca08..4ae8ba321e 100644
--- a/contrib/reprobuild/Dockerfile.noble
+++ b/contrib/reprobuild/Dockerfile.noble
@@ -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 945f38536c..2a103dd53a 100644
--- a/contrib/reprobuild/Dockerfile.resolute
+++ b/contrib/reprobuild/Dockerfile.resolute
@@ -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 \ |
…lute Switch `Dockerfile.noble` and `Dockerfile.resolute` to noble / resolute to match the debootstrap-based minimal image approach.
d833fd4 to
783515c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cln-repro-*images use minimal debootstrapped base images (jammy, noble, resolute) with additional layers fromcontrib/reprobuild/. Currently,Dockerfile.nobleandDockerfile.resoluteincorrectly pull fromubuntu:nobleandubuntu:resoluteinstead of using the debootstrappednobleandresolutebase images, breaking consistency withDockerfile.jammy. This PR corrects the base images for noble and resolute. No changes needed for jammy.Changelog-None.