From d734ee0423cc251b8d3b3f536c7aefb2e0b54721 Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Thu, 15 Oct 2015 10:36:25 -0400 Subject: [PATCH 1/2] Updates to Dockerfile --- docker/Dockerfile => Dockerfile | 12 +++++++----- docker/launch | 9 ++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) rename docker/Dockerfile => Dockerfile (53%) diff --git a/docker/Dockerfile b/Dockerfile similarity index 53% rename from docker/Dockerfile rename to Dockerfile index 164611c2..59b0b21d 100644 --- a/docker/Dockerfile +++ b/Dockerfile @@ -1,17 +1,19 @@ +# This will build the witness_node in a docker image. Make sure you've already +# checked out the submodules before building. + FROM l3iggs/archlinux:latest MAINTAINER Nathan Hourt RUN pacman -Syu --noconfirm gcc make autoconf automake cmake ninja boost libtool git -RUN git clone https://github.com/bitshares/bitshares-2 +ADD . /bitshares-2 WORKDIR /bitshares-2 -RUN git submodule update --init --recursive -RUN cmake -G Ninja . +RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=Release . RUN ninja witness_node RUN mkdir /data_dir -ADD default_config.ini /default_config.ini -ADD launch /launch +ADD docker/default_config.ini /default_config.ini +ADD docker/launch /launch RUN chmod a+x /launch VOLUME /data_dir diff --git a/docker/launch b/docker/launch index c81e0ad2..69373413 100644 --- a/docker/launch +++ b/docker/launch @@ -1,4 +1,11 @@ #!/bin/bash [ -e /data_dir/config.ini ] || cp /default_config.ini /data_dir/config.ini -/bitshares-2/programs/witness_node/witness_node --data-dir /data_dir + +[ -e /data_dir/pre_exec ] && bash /data_dir/pre_exec +if [ -e /data_dir/extra_args ]; then + /bitshares-2/programs/witness_node/witness_node --data-dir /data_dir `cat /data_dir/extra_args` +else + /bitshares-2/programs/witness_node/witness_node --data-dir /data_dir +fi +[ -e /data_dir/post_exec ] && bash /data_dir/post_exec From e4635c5c19354259229b376822a74e7a10ed703a Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Thu, 15 Oct 2015 11:04:46 -0400 Subject: [PATCH 2/2] If build fails, try building with a single thread --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 59b0b21d..3a9c57ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN pacman -Syu --noconfirm gcc make autoconf automake cmake ninja boost libtool ADD . /bitshares-2 WORKDIR /bitshares-2 RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=Release . -RUN ninja witness_node +RUN ninja witness_node || ninja -j 1 witness_node RUN mkdir /data_dir ADD docker/default_config.ini /default_config.ini