From 64d37111b51f9e275d6b24627d2d994c2c323a74 Mon Sep 17 00:00:00 2001
From: Brian Schroeder <bts@gmail.com>
Date: Fri, 14 Jul 2017 11:45:11 -0400
Subject: [PATCH] Fix build

---
 Dockerfile       | 9 ++++++---
 requirements.txt | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aa063b9..95a0718 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,9 +9,10 @@ RUN apt-get update &&\
 WORKDIR /
 ADD . hydrachain
 
-RUN pip install -U setuptools
+RUN pip install --upgrade pip setuptools
+
 # Pre-install hydrachain dependency
-RUN pip install secp256k1==0.12.1
+RUN pip install secp256k1==0.13.2
 
 WORKDIR /hydrachain
 # Reset potentially dirty directory and remove after install
@@ -19,4 +20,6 @@ RUN git reset --hard && pip install . && cd .. && rm -rf /hydrachain
 WORKDIR /
 
 ENTRYPOINT ["/usr/local/bin/hydrachain"]
-CMD ["run"]
+
+# Run multiple nodes in a single process
+CMD ["-d", "datadir", "runmultiple", "--num_validators=3", "--seed=42"]
diff --git a/requirements.txt b/requirements.txt
index 98bff3f..2f7cae3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,9 @@
 bitcoin>=1.1.39
 rlp>=0.4.3
-pyethapp>=1.2.1
-secp256k1==0.12.1
+pyethapp==1.5.0
+secp256k1==0.13.2
 simpy==3.0.8
+
+# Added to get upstream pyethapp working
+pyelliptic==1.5.7
+ethereum>=1.5.1,<2.0