Merge pull request #130 from commerceblock/develop

Release 1.2.2 - More entry options
commerceblock · Jan 23, 2020 · 89d4832 · 89d4832
2 parents c9f0833 + 5220b11
commit 89d4832
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/Dockerfile.tests b/Dockerfile.tests
@@ -20,20 +20,9 @@ RUN set -x \
 
 RUN set -ex \
     && cd $HOME \
-    && mkdir $HOME/.bitcoin \
-    && printf '%s\n' '#!/bin/sh' 'rpcuser=user' \
-        'rpcpassword=pass' \
-        'rpcport=18443' \
-        'keypool=0' \
-        'deprecatedrpc=signrawtransaction' \
-        'server=1' \
-        'regtest=1' \
-        'daemon=1' \
-        'txindex=1' > ~/.bitcoin/bitcoin.conf \
     && wget ${PKG_URL} \
     && tar zxvf ${PKG} \
     && export PATH=$PATH:$HOME/bitcoin-${PKG_VER}/bin \
-    && bitcoind \
     && /go/src/mainstay/scripts/run-tests.sh
 
 COPY docker-entrypoint.sh /

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -25,6 +25,9 @@ elif [[ "$1" == "signer2" ]]; then
 elif [[ "$1" == "ocean_commitment" ]]; then
     echo "Running commitment tool for Ocean"
     go run $GOPATH/src/mainstay/cmd/commitmenttool/commitmenttool.go -ocean -privkey $COMMITMENT_PRIV -position $COMMITMENT_POS -authtoken $COMMITMENT_AUTH -apiHost $MAINSTAY_HOST -delay $COMMITMENT_DELAY
+elif [[ "$1" == "ocean_commitment_nopriv" ]]; then
+    echo "Running commitment tool for Ocean without priv key"
+    go run $GOPATH/src/mainstay/cmd/commitmenttool/commitmenttool.go -ocean $COMMITMENT_POS -authtoken $COMMITMENT_AUTH -apiHost $MAINSTAY_HOST -delay $COMMITMENT_DELAY
 else
   $@
 fi