Fix base image inconsistency in reprobuild for noble & resolute#9185
Fix base image inconsistency in reprobuild for noble & resolute#9185ShahanaFarooqui wants to merge 1 commit into
Conversation
|
I tried to run |
|
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 \ |
d833fd4 to
783515c
Compare
|
@ShahanaFarooqui I tried noble and resolute with and resolute worked fine for me. noble had some issues with some shasums which i updated in the fixup commit. Please let me know how to reproduce your resolute issue. |
As it turns out, my AI and I took a little detour into hallucination land. I was simply running the wrong command for resolute 😅 . Thanks a lot for fixing it up!!! Squashed your fixup, as leftover fixup commit sometimes created issues for our Mac users. |
…lute Switch `Dockerfile.noble` and `Dockerfile.resolute` to noble / resolute to match the debootstrap-based minimal image approach.
49e1e90 to
470bac3
Compare
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.