From ea842d9ca85fb359d2d91112a4f84d47edde59ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Brezo=2C=20Ph=2E=20D?= Date: Tue, 22 Jan 2019 13:11:23 +0100 Subject: [PATCH 1/2] Update Dockerfile Update Multichain version to 1.0.7. --- base/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 1515be5..0260e5a 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -10,9 +10,9 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && cd /tmp \ - && wget http://www.multichain.com/download/multichain-1.0.4.tar.gz \ - && tar -xvzf multichain-1.0.4.tar.gz \ - && cd multichain-1.0.4 \ + && wget http://www.multichain.com/download/multichain-1.0.7.tar.gz \ + && tar -xvzf multichain-1.0.7.tar.gz \ + && cd multichain-1.0.7 \ && mv multichaind multichain-cli multichain-util /usr/local/bin \ && cd /tmp \ && rm -Rf multichain* From 57fffdce131b44c72a5c8e36c9d5119810ce2e0f Mon Sep 17 00:00:00 2001 From: febrezo Date: Tue, 22 Jan 2019 18:34:07 +0100 Subject: [PATCH 2/2] Use i3visio Docker images to grab an upgraded Multichain --- explorer/Dockerfile | 5 +++-- explorer/runexplorer.sh | 10 +++++----- master/Dockerfile | 2 +- node/Dockerfile | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/explorer/Dockerfile b/explorer/Dockerfile index 0f5f1cb..1d7ed96 100644 --- a/explorer/Dockerfile +++ b/explorer/Dockerfile @@ -1,9 +1,9 @@ -FROM kunstmaan/node-multichain +FROM i3visio/node-multichain MAINTAINER Kunstmaan RUN apt-get update \ && apt-get install -q -y python python-dev python-pip sqlite3 libsqlite3-dev \ - && pip install pycrypto \ + && pip install pycrypto py-ubjson\ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -21,3 +21,4 @@ RUN chmod a+x /root/runexplorer.sh EXPOSE 2750 CMD ["/bin/bash", "/root/runexplorer.sh"] + diff --git a/explorer/runexplorer.sh b/explorer/runexplorer.sh index 78a52d8..0cb267b 100644 --- a/explorer/runexplorer.sh +++ b/explorer/runexplorer.sh @@ -1,13 +1,13 @@ #!/bin/bash -x -echo "Sleep for 30 seconds so the master node has initialised" -sleep 30 +echo "Sleep for 3 seconds so the master node has initialised" +#sleep 3 echo "Start the chain" -multichaind -daemon -txindex -shrinkdebugfilesize $CHAINNAME@$MASTER_NODE:$NETWORK_PORT +multichaind -daemon -txindex -shrinkdebugfilesize $CHAINNAME@$MASTER_NODE_HOST:$MASTER_NODE_PORT -echo "Sleep for 30 seconds so the slave node has initialised" -sleep 30 +echo "Sleep for 3 seconds so the slave node has initialised" +sleep 3 echo "Setup /root/.multichain/$CHAINNAME/multichain.conf" echo "rpcport=$RPC_PORT" >> /root/.multichain/$CHAINNAME/multichain.conf diff --git a/master/Dockerfile b/master/Dockerfile index 8a2412b..1b061f0 100644 --- a/master/Dockerfile +++ b/master/Dockerfile @@ -1,4 +1,4 @@ -FROM kunstmaan/base-multichain +FROM i3visio/base-multichain MAINTAINER Kunstmaan COPY ./runchain.sh /root/runchain.sh diff --git a/node/Dockerfile b/node/Dockerfile index f6f350c..8285c2e 100644 --- a/node/Dockerfile +++ b/node/Dockerfile @@ -1,4 +1,4 @@ -FROM kunstmaan/base-multichain +FROM i3visio/base-multichain MAINTAINER Kunstmaan ADD ./runchain.sh /root/runchain.sh