Rework. See notes below.

Notes:
1. Refactored:
   * Dockerfile: exploit image caching
   * Create directory `nodes` for node conf, data, etc.
2. Updates:
   * bitcoin-cli: `getwalletinfo` command replaces `getinfo`
3. Use supervisord to make container detachable

References:
1. PR (for supervisord code): freewil#30

Author: GochoMugo

.dockerignore

@@ -0,0 +1,6 @@
+.dockerignore
+.git
+.gitignore
+Dockerfile
+nodes/logs/.gitkeep
+script/

Dockerfile

@@ -5,32 +5,38 @@ FROM ubuntu:14.04
 MAINTAINER Sean Lavine <lavis88@gmail.com>
 
 # add bitcoind from the official PPA
+# phase 1 (make `add-apt-repository` available):
 RUN apt-get update
 RUN apt-get install --yes software-properties-common
+# phase 2 (add PPAs -> update cache -> install pkgs):
 RUN add-apt-repository --yes ppa:bitcoin/bitcoin
 RUN apt-get update
-
-# install bitcoind (from PPA) and make
-RUN apt-get install --yes bitcoind make
+RUN apt-get install --yes \
+    bitcoind \
+    make \
+    supervisor
 
 # create a non-root user
-RUN adduser --disabled-login --gecos "" tester
+RUN adduser --disabled-login --gecos "" tester && \
+    mkdir /home/tester/bitcoin-testnet-box
+
+# run commands from inside the testnet-box directory
+WORKDIR /home/tester/bitcoin-testnet-box
+
+# expose two rpc ports for the nodes to allow outside container access
+EXPOSE 19001 19011
 
-# run following commands from user's home directory
-WORKDIR /home/tester
+# describe how to start container
+CMD ["/usr/bin/supervisord"]
 
 # copy the testnet-box files into the image
 ADD . /home/tester/bitcoin-testnet-box
 
 # make tester user own the bitcoin-testnet-box
 RUN chown -R tester:tester /home/tester/bitcoin-testnet-box
 
+# create volume for the nodes
+# VOLUME /home/tester/bitcoin-testnet-box/nodes
+
 # use the tester user when running the image
 USER tester
-
-# run commands from inside the testnet-box directory
-WORKDIR /home/tester/bitcoin-testnet-box
-
-# expose two rpc ports for the nodes to allow outside container access
-EXPOSE 19001 19011
-CMD ["/bin/bash"]

Makefile

@@ -1,29 +1,19 @@
-BITCOIND=bitcoind
-BITCOINGUI=bitcoin-qt
 BITCOINCLI=bitcoin-cli
 B1_FLAGS=
 B2_FLAGS=
-B1=-datadir=1 $(B1_FLAGS)
-B2=-datadir=2 $(B2_FLAGS)
+B1=-datadir=nodes/1 $(B1_FLAGS)
+B2=-datadir=nodes/2 $(B2_FLAGS)
 BLOCKS=1
 ADDRESS=
 AMOUNT=
 ACCOUNT=
 
-start:
-	$(BITCOIND) $(B1) -daemon
-	$(BITCOIND) $(B2) -daemon
-
-start-gui:
-	$(BITCOINGUI) $(B1) &
-	$(BITCOINGUI) $(B2) &
-
 generate:
 	$(BITCOINCLI) $(B1) generate $(BLOCKS)
 
-getinfo:
-	$(BITCOINCLI) $(B1) getinfo
-	$(BITCOINCLI) $(B2) getinfo
+getwalletinfo:
+	$(BITCOINCLI) $(B1) getwalletinfo
+	$(BITCOINCLI) $(B2) getwalletinfo
 
 sendfrom1:
 	$(BITCOINCLI) $(B1) sendtoaddress $(ADDRESS) $(AMOUNT)
@@ -42,5 +32,5 @@ stop:
 	$(BITCOINCLI) $(B2) stop
 
 clean:
-	find 1/regtest/* -not -name 'server.*' -delete
-	find 2/regtest/* -not -name 'server.*' -delete
+	find nodes/1/regtest/* -not -name 'server.*' -delete
+	find nodes/2/regtest/* -not -name 'server.*' -delete