From 136a5f2b746bdb3b3eda0089f9d08a8a206dec47 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Wed, 28 Feb 2018 12:03:14 +0100 Subject: [PATCH] contrib: Updated builder image to include v0.16.0 of bitcoind Now that 0.16.0 is stable we should make use of it Signed-off-by: Christian Decker --- contrib/Dockerfile.builder | 7 ++++--- contrib/Dockerfile.builder.i386 | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/contrib/Dockerfile.builder b/contrib/Dockerfile.builder index 4b6f83552..bf00f6579 100644 --- a/contrib/Dockerfile.builder +++ b/contrib/Dockerfile.builder @@ -2,6 +2,7 @@ FROM ubuntu:16.04 MAINTAINER Christian Decker ENV DEBIAN_FRONTEND noninteractive +ENV BITCOIN_VERSION 0.16.0 WORKDIR /build RUN apt-get -qq update && \ @@ -30,10 +31,10 @@ RUN apt-get -qq update && \ rm -rf /var/lib/apt/lists/* RUN cd /tmp/ && \ - wget https://bitcoin.org/bin/bitcoin-core-0.15.1/bitcoin-0.15.1-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz && \ + wget https://bitcoin.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 /tmp/bitcoin-0.15.1/bin/bitcoin* /usr/local/bin/ && \ - rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.1 + mv /tmp/bitcoin-$BITCOIN_VERSION/bin/bitcoin* /usr/local/bin/ && \ + rm -rf bitcoin.tar.gz /tmp/bitcoin-$BITCOIN_VERSION RUN pip3 install --upgrade pip && \ pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 diff --git a/contrib/Dockerfile.builder.i386 b/contrib/Dockerfile.builder.i386 index 79ebfa00a..7f4b9d517 100644 --- a/contrib/Dockerfile.builder.i386 +++ b/contrib/Dockerfile.builder.i386 @@ -2,6 +2,7 @@ FROM i386/ubuntu:16.04 MAINTAINER Christian Decker ENV DEBIAN_FRONTEND noninteractive +ENV BITCOIN_VERSION 0.16.0 WORKDIR /build RUN apt-get -qq update && \ @@ -30,10 +31,10 @@ RUN apt-get -qq update && \ rm -rf /var/lib/apt/lists/* RUN cd /tmp/ && \ - wget https://bitcoin.org/bin/bitcoin-core-0.15.1/bitcoin-0.15.1-i686-pc-linux-gnu.tar.gz -O bitcoin.tar.gz && \ + wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-i686-pc-linux-gnu.tar.gz -O bitcoin.tar.gz && \ tar -xvzf bitcoin.tar.gz && \ - mv /tmp/bitcoin-0.15.1/bin/bitcoin* /usr/local/bin/ && \ - rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.1 + mv /tmp/bitcoin-$BITCOIN_VERSION/bin/bitcoin* /usr/local/bin/ && \ + rm -rf bitcoin.tar.gz /tmp/bitcoin-$BITCOIN_VERSION RUN pip3 install --upgrade pip && \ pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1