From 847df2eb1df6cf89b7986432264feea829036807 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Tue, 31 Oct 2017 12:27:13 +0100 Subject: [PATCH] contrib: Updated dockerfile to use bitcoind v0.15.1 This was causing intermittent `rawtransactiondecode` errors see ElementsProject/lightning#332 Reported-by: @achow101 Signed-off-by: Christian Decker --- contrib/Dockerfile.builder | 18 +++++++--- contrib/Dockerfile.builder.i386 | 61 +++++++++++++++++---------------- 2 files changed, 44 insertions(+), 35 deletions(-) diff --git a/contrib/Dockerfile.builder b/contrib/Dockerfile.builder index 66042b45c..11950f4a5 100644 --- a/contrib/Dockerfile.builder +++ b/contrib/Dockerfile.builder @@ -1,12 +1,14 @@ FROM ubuntu:16.04 +MAINTAINER Christian Decker ENV DEBIAN_FRONTEND noninteractive WORKDIR /build -RUN echo "deb http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu xenial main" | tee -a /etc/apt/sources.list.d/bitcoin.list RUN apt-get -qq update && \ - apt-get -qq install --allow-unauthenticated -yy \ - eatmydata \ + apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \ + autoconf \ + automake \ + eatmydata \ software-properties-common \ build-essential \ autoconf \ @@ -20,8 +22,14 @@ RUN apt-get -qq update && \ python3 \ valgrind \ net-tools \ - bitcoind \ python3-pip \ - && rm -rf /var/lib/apt/lists/* + wget && \ + rm -rf /var/lib/apt/lists/* + +RUN cd /tmp/ && \ + wget https://bitcoin.org/bin/bitcoin-core-0.15.0.1/bitcoin-0.15.0.1-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz && \ + tar -xvzf bitcoin.tar.gz && \ + mv /tmp/bitcoin-0.15.0/bin/bitcoin* /usr/local/bin/ && \ + rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.0 RUN pip3 install python-bitcoinlib==0.7.0 diff --git a/contrib/Dockerfile.builder.i386 b/contrib/Dockerfile.builder.i386 index 45910b360..b71fc7bbf 100644 --- a/contrib/Dockerfile.builder.i386 +++ b/contrib/Dockerfile.builder.i386 @@ -1,34 +1,35 @@ FROM i386/ubuntu:16.04 MAINTAINER Christian Decker -RUN echo deb http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu xenial main > /etc/apt/sources.list.d/bitcoin-bitcoin-xenial.list -RUN apt-get update -qq -RUN apt-get install -qq -y --no-install-recommends --allow-unauthenticated \ - asciidoc \ - curl \ - git \ - make \ - automake \ - autoconf \ - libtool \ - bitcoind \ - build-essential \ - libprotobuf-c-dev \ - libsodium-dev \ - libbase58-dev \ - libsqlite3-dev \ - libgmp-dev \ - libsqlite3-dev \ - git \ - net-tools \ - valgrind \ - ca-certificates \ - python \ - python3 \ - python3-pip \ - python3-setuptools \ - && rm -rf /var/lib/apt/lists/* - -RUN pip3 install python-bitcoinlib==0.7. -RUN mkdir /build +ENV DEBIAN_FRONTEND noninteractive WORKDIR /build + +RUN apt-get -qq update && \ + apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \ + autoconf \ + automake \ + eatmydata \ + software-properties-common \ + build-essential \ + autoconf \ + libtool \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libgmp-dev \ + libsqlite3-dev \ + git \ + python \ + python3 \ + valgrind \ + net-tools \ + python3-pip \ + wget && \ + rm -rf /var/lib/apt/lists/* + +RUN cd /tmp/ && \ + wget https://bitcoin.org/bin/bitcoin-core-0.15.0.1/bitcoin-0.15.0.1-i686-pc-linux-gnu.tar.gz -O bitcoin.tar.gz && \ + tar -xvzf bitcoin.tar.gz && \ + mv /tmp/bitcoin-0.15.0/bin/bitcoin* /usr/local/bin/ && \ + rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.0 + +RUN pip3 install python-bitcoinlib==0.7.0