From 9b0564f0f0d7e1711565a4d89b4291bc9144e962 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Thu, 18 Aug 2016 11:45:34 +0200
Subject: [PATCH] version bump for baseimage + bitcoind

---
 Dockerfile      | 9 +++++++--
 README.markdown | 6 ++++++
 bitcoin.run     | 3 +++
 sources.list    | 8 --------
 4 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 sources.list

diff --git a/Dockerfile b/Dockerfile
index 1fe0359..fba49c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,13 @@
-FROM phusion/baseimage:0.9.18
+FROM phusion/baseimage:0.9.19
 
 ENV BITCOIND_REV master
 
-ADD ./sources.list /etc/apt/sources.list
+ARG UBUNTU_MIRROR=mirror://mirrors.ubuntu.com/mirrors.txt
+
+RUN sed -i -e s#http://archive.ubuntu.com/ubuntu#${UBUNTU_MIRROR}#g \
+    -e s#http://security.ubuntu.com/ubuntu#${UBUNTU_MIRROR}#g \
+        /etc/apt/sources.list ; \
+        cat /etc/apt/sources.list
 
 RUN apt-get update && \
     apt-get install -y \
diff --git a/README.markdown b/README.markdown
index 4b85701..7d50430 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,6 +3,12 @@
 * supports zmq
 * wallet support disabled
 
+# Notes
+
+This outputs the config file, including the
+rpc user password (either from `BITCOIND_RPCPASSWORD` or randomly
+generated) to the logs on startup.
+
 # Versions
 
 * sneak/bitcoind:latest -> bitcoind master
diff --git a/bitcoin.run b/bitcoin.run
index 2f8499e..6b91b8f 100644
--- a/bitcoin.run
+++ b/bitcoin.run
@@ -10,6 +10,9 @@ rpcuser=${BITCOIND_RPCUSER:-rpcuser}
 rpcpassword=${BITCOIND_RPCPASSWORD:-$RANDOMPW}
 EOF
 
+# SECURITY this puts the rpc password into the container log
+cat $HOME/bitcoin.conf
+
 ARGS=""
 ARGS+=" -printtoconsole"
 ARGS+=" -disablewallet"
diff --git a/sources.list b/sources.list
deleted file mode 100644
index 535743f..0000000
--- a/sources.list
+++ /dev/null
@@ -1,8 +0,0 @@
-deb mirror://mirrors.ubuntu.com/mirrors.txt trusty main universe
-deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-updates main universe
-deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-security main universe
-deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-backports main universe
-#deb http://archive.ubuntu.com/ubuntu trusty main universe
-#deb http://archive.ubuntu.com/ubuntu trusty-updates main universe
-#deb http://archive.ubuntu.com/ubuntu trusty-security main universe
-#deb http://archive.ubuntu.com/ubuntu trusty-backports main universe