Skip to content

Commit be5ad3d

Browse files
ShahanaFarooquirustyrussell
authored andcommitted
docker: Docker file fixes for reproducible builds
- Added missing mako and grpcio-tools for ubuntu distro Docker files - Fixed incorrect bitcoincore link Changelog-Fixed: Fedora, focal, jammy & noble's failing reproducible builds are fixed now.
1 parent 7056018 commit be5ad3d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

contrib/docker/Dockerfile.builder.fedora

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM fedora:35
22

3-
ENV BITCOIN_VERSION 27.1
3+
ENV BITCOIN_VERSION=27.1
44
WORKDIR /tmp
55

66
RUN dnf update -y && \
@@ -12,8 +12,8 @@ RUN dnf update -y && \
1212
libsq3-devel \
1313
python3-devel \
1414
python3-mako \
15-
python3-pip \
16-
python3-virtualenv \
15+
python3-pip \
16+
python3-virtualenv \
1717
python3-setuptools \
1818
redhat-lsb \
1919
net-tools \
@@ -25,7 +25,7 @@ RUN dnf update -y && \
2525
zlib-devel && \
2626
dnf clean all
2727

28-
RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz && \
28+
RUN wget https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz && \
2929
tar -xvzf bitcoin.tar.gz && \
3030
mv bitcoin-$BITCOIN_VERSION/bin/bitcoin* /usr/local/bin/ && \
3131
mv bitcoin-$BITCOIN_VERSION/lib/* /usr/local/lib/ && \

contrib/reprobuild/Dockerfile.focal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \
4949

5050
RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \
5151
&& rm /tmp/get-pip.py \
52-
&& pip install poetry
52+
&& pip install poetry mako grpcio-tools
5353

5454
RUN wget https://sh.rustup.rs -O rustup-install.sh && \
5555
bash rustup-install.sh --default-toolchain none --quiet -y && \

contrib/reprobuild/Dockerfile.jammy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \
4747

4848
RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \
4949
&& rm /tmp/get-pip.py \
50-
&& pip install poetry
50+
&& pip install poetry mako grpcio-tools
5151

5252
RUN wget https://sh.rustup.rs -O rustup-install.sh && \
5353
bash rustup-install.sh --default-toolchain none --quiet -y && \

contrib/reprobuild/Dockerfile.noble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \
4545

4646
RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \
4747
&& rm /tmp/get-pip.py \
48-
&& pip install poetry
48+
&& pip install poetry mako grpcio-tools
4949

5050
RUN wget https://sh.rustup.rs -O rustup-install.sh && \
5151
bash rustup-install.sh --default-toolchain none --quiet -y && \

0 commit comments

Comments
 (0)