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.
This commit is contained in:
ShahanaFarooqui 2024-08-13 18:36:28 -07:00 committed by Rusty Russell
parent 7056018b15
commit be5ad3d7a9
4 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
FROM fedora:35
ENV BITCOIN_VERSION 27.1
ENV BITCOIN_VERSION=27.1
WORKDIR /tmp
RUN dnf update -y && \
@ -12,8 +12,8 @@ RUN dnf update -y && \
libsq3-devel \
python3-devel \
python3-mako \
python3-pip \
python3-virtualenv \
python3-pip \
python3-virtualenv \
python3-setuptools \
redhat-lsb \
net-tools \
@ -25,7 +25,7 @@ RUN dnf update -y && \
zlib-devel && \
dnf clean all
RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz && \
RUN wget https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz && \
tar -xvzf bitcoin.tar.gz && \
mv bitcoin-$BITCOIN_VERSION/bin/bitcoin* /usr/local/bin/ && \
mv bitcoin-$BITCOIN_VERSION/lib/* /usr/local/lib/ && \

View File

@ -49,7 +49,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \
RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \
&& rm /tmp/get-pip.py \
&& pip install poetry
&& pip install poetry mako grpcio-tools
RUN wget https://sh.rustup.rs -O rustup-install.sh && \
bash rustup-install.sh --default-toolchain none --quiet -y && \

View File

@ -47,7 +47,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \
RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \
&& rm /tmp/get-pip.py \
&& pip install poetry
&& pip install poetry mako grpcio-tools
RUN wget https://sh.rustup.rs -O rustup-install.sh && \
bash rustup-install.sh --default-toolchain none --quiet -y && \

View File

@ -45,7 +45,7 @@ RUN git clone https://github.com/pyenv/pyenv.git /root/.pyenv && \
RUN wget https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py && python3 /tmp/get-pip.py \
&& rm /tmp/get-pip.py \
&& pip install poetry
&& pip install poetry mako grpcio-tools
RUN wget https://sh.rustup.rs -O rustup-install.sh && \
bash rustup-install.sh --default-toolchain none --quiet -y && \