Merge branch '0.12.0'

This commit is contained in:
Jeffrey Paul 2016-04-11 15:57:06 +02:00
commit bdc3177725
Signed by: sneak
GPG Key ID: 052443F4DF2A55C2

View File

@ -1,12 +1,15 @@
FROM phusion/baseimage:0.9.18 FROM phusion/baseimage:0.9.18
ENV BITCOIND_REV master ENV BITCOIND_REV master
ADD ./sources.list /etc/apt/sources.list ADD ./sources.list /etc/apt/sources.list
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
build-essential libtool autotools-dev automake pkg-config libssl-dev \ build-essential libtool autotools-dev automake pkg-config libssl-dev \
libevent-dev bsdmainutils libboost-all-dev libzmq3 libzmq3-dev \ libevent-dev bsdmainutils libzmq3 libzmq3-dev \
libboost-system-dev libboost-filesystem-dev libboost-chrono-dev \
libboost-program-options-dev libboost-test-dev libboost-thread-dev \
libminiupnpc-dev git && \ libminiupnpc-dev git && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@ -23,7 +26,9 @@ RUN cd /usr/local/src/bitcoin && \
RUN apt-get remove -y \ RUN apt-get remove -y \
build-essential libtool autotools-dev automake pkg-config libssl-dev \ build-essential libtool autotools-dev automake pkg-config libssl-dev \
libevent-dev bsdmainutils libboost-all-dev libzmq3-dev \ libevent-dev bsdmainutils libzmq3-dev \
libboost-system-dev libboost-filesystem-dev libboost-chrono-dev \
libboost-program-options-dev libboost-test-dev libboost-thread-dev \
libminiupnpc-dev git && \ libminiupnpc-dev git && \
apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*