Skip to content

Commit 57663bb

Browse files
ShahanaFarooquirustyrussell
authored andcommitted
docker: install lowdown and libsodium-dev for reproducible builds
After external lowdown and libsodium-dev removal with PR #8536, we need to explicitly install them in Dockerfiles.
1 parent 7170fe2 commit 57663bb

File tree

5 files changed

+69
-35
lines changed

5 files changed

+69
-35
lines changed

contrib/docker/Dockerfile.builder.fedora

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,17 @@ RUN dnf update -y && \
2020
jq \
2121
xz \
2222
zlib-devel \
23-
cargo && \
23+
cargo \
24+
libsodium-devel && \
25+
wget https://github.com/kristapsdz/lowdown/archive/refs/tags/VERSION_1_0_2.tar.gz && \
26+
tar -xzf VERSION_1_0_2.tar.gz && \
27+
cd lowdown-VERSION_1_0_2 && \
28+
./configure && \
29+
make && \
30+
make install && \
31+
ldconfig && \
32+
cd /tmp && \
33+
rm -rf VERSION_1_0_2.tar.gz lowdown-VERSION_1_0_2 && \
2434
dnf clean all
2535

2636
RUN wget https://storage.googleapis.com/c-lightning-tests/bitcoind/bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz \

contrib/reprobuild/Dockerfile.focal

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,32 @@ RUN sed -i '/updates/d' /etc/apt/sources.list && \
1111
sed -i '/security/d' /etc/apt/sources.list
1212

1313
RUN apt-get update \
14-
&& apt-get install -y --no-install-recommends \
15-
autoconf \
16-
build-essential \
17-
ca-certificates \
18-
file \
19-
gettext \
20-
git \
21-
libpq-dev \
22-
libsodium23 \
23-
libtool \
24-
m4 \
25-
sudo \
26-
unzip \
27-
wget \
28-
git \
29-
zip
14+
&& apt-get install -y --no-install-recommends \
15+
autoconf \
16+
build-essential \
17+
ca-certificates \
18+
file \
19+
gettext \
20+
git \
21+
libpq-dev \
22+
libsodium23 \
23+
libsodium-dev \
24+
libtool \
25+
m4 \
26+
sudo \
27+
unzip \
28+
wget \
29+
zip \
30+
&& cd /tmp \
31+
&& wget https://github.com/kristapsdz/lowdown/archive/refs/tags/VERSION_1_0_2.tar.gz \
32+
&& tar -xzf VERSION_1_0_2.tar.gz \
33+
&& cd lowdown-VERSION_1_0_2 \
34+
&& ./configure \
35+
&& make \
36+
&& make install \
37+
&& ldconfig \
38+
&& cd / \
39+
&& rm -rf /tmp/VERSION_1_0_2.tar.gz /tmp/lowdown-VERSION_1_0_2
3040

3141
# Ensure correct ownership
3242
RUN chown root:root /etc/sudoers

contrib/reprobuild/Dockerfile.jammy

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,35 @@ ENV PROTOC_VERSION=29.4
1010
RUN sed -i '/updates/d' /etc/apt/sources.list && \
1111
sed -i '/security/d' /etc/apt/sources.list
1212

13-
RUN apt-get update \
14-
&& apt-get install -y --no-install-recommends \
15-
autoconf \
16-
build-essential \
17-
ca-certificates \
18-
file \
19-
gettext \
20-
git \
21-
libsqlite3-dev \
22-
libpq-dev \
23-
libsodium23 \
24-
libtool \
25-
m4 \
26-
sudo \
27-
unzip \
28-
wget \
29-
jq \
30-
zip
13+
RUN apt-get update && \
14+
apt-get install -y --no-install-recommends \
15+
autoconf \
16+
build-essential \
17+
ca-certificates \
18+
file \
19+
gettext \
20+
git \
21+
libsqlite3-dev \
22+
libpq-dev \
23+
libsodium23 \
24+
libsodium-dev \
25+
libtool \
26+
m4 \
27+
sudo \
28+
unzip \
29+
wget \
30+
jq \
31+
zip \
32+
&& cd /tmp \
33+
&& wget https://github.com/kristapsdz/lowdown/archive/refs/tags/VERSION_1_0_2.tar.gz \
34+
&& tar -xzf VERSION_1_0_2.tar.gz \
35+
&& cd lowdown-VERSION_1_0_2 \
36+
&& ./configure \
37+
&& make \
38+
&& make install \
39+
&& ldconfig \
40+
&& cd / \
41+
&& rm -rf /tmp/VERSION_1_0_2.tar.gz /tmp/lowdown-VERSION_1_0_2
3142

3243
# Ensure correct ownership
3344
RUN chown root:root /etc/sudoers

contrib/reprobuild/Dockerfile.noble

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ RUN apt-get update \
2222
libsqlite3-dev \
2323
libpq-dev \
2424
libsodium23 \
25+
libsodium-dev \
26+
lowdown \
2527
libtool \
2628
m4 \
2729
sudo \

tools/repro-build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ adae5a301c7899c1bce8ae26b5423716a47e516df25c09d6d536607bc34853bc /var/cache/apt
118118
d8b8653388e676a3ae2fcf565c2b1a42a01a1104062317f641e8d24f0eaff9c3 /var/cache/apt/archives/libpq-dev_14.2-1ubuntu1_amd64.deb
119119
542dcee1409c74d03ecdd4ca4a0cfd467e5d2804d9985b58e39d3c5889a409e3 /var/cache/apt/archives/libpq5_14.2-1ubuntu1_amd64.deb
120120
885ee09c37d0e37ef6042e8cb4a22ccbab92101f21ab0c8f51ae961e4484407c /var/cache/apt/archives/libsodium23_1.0.18-1build2_amd64.deb
121+
09584c8ab2f840bf3db4a5763f6e4b450688aa8879acd4c8f4c1942375b9ca57 /var/cache/apt/archives/libsodium-dev_1.0.18-1build2_amd64.deb
121122
000a1d5c0df0373c75fadbfea604afb6b1325bf866a3ce637ae0138abe6d556d /var/cache/apt/archives/libsqlite3-0_3.37.2-2_amd64.deb
122123
1b2a93020593c9e94a25f750ce442da5a6e8ff48a20f52cec92dfc3fa35336d8 /var/cache/apt/archives/linux-libc-dev_5.15.0-25.25_amd64.deb
123124
572a544d2c18bf49d25c465720c570cd8e6e38731386ac9c0a7f29bed2486f3e /var/cache/apt/archives/m4_1.4.18-5ubuntu2_amd64.deb

0 commit comments

Comments
 (0)