Merge branch '0.12.0'

Dockerfile

@@ -19,17 +19,14 @@ RUN cd /usr/local/src/bitcoin && \
     git checkout $BITCOIND_REV && \
     ./autogen.sh && \
     ./configure --disable-wallet --enable-hardening && \
-    make -j10 && \
+    make -j2 && \
     make install && \
     cd / && \
     rm -rf /usr/local/src/bitcoin
 
 RUN apt-get remove -y \
-    build-essential libtool autotools-dev automake pkg-config libssl-dev \
+    build-essential libtool autotools-dev automake \
-    libevent-dev bsdmainutils libzmq3-dev \
+    pkg-config bsdmainutils git && \
-    libboost-system-dev libboost-filesystem-dev libboost-chrono-dev \
-    libboost-program-options-dev libboost-test-dev libboost-thread-dev \
-    libminiupnpc-dev git && \
     apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENV HOME /var/lib/bitcoin

Makefile

@@ -1,10 +1,10 @@
 default: build
 
 build: kill
-	docker build -t sneak/bitcoind .
+	docker build -t sneak/bitcoind:0.12.0 .
 
 run: kill
-	docker run --name sneak-bitcoind -d sneak/bitcoind
+	docker run --name sneak-bitcoind -d sneak/bitcoind:0.12.0
 	docker logs -f sneak-bitcoind
 
 kill:

bitcoin.run

@@ -16,8 +16,8 @@ exec chpst -ubitcoin \
     bitcoind \
         -printtoconsole \
         -disablewallet \
-        -datadir $HOME \
+        -datadir=/var/lib/bitcoin \
-        -conf $HOME/bitcoin.conf \
+        -conf=/var/lib/bitcoin/bitcoin.conf \
         -rpcallowip=::/0 \
         $BITCOIND_EXTRA_OPTS \
         2>&1