Browse Source

Merge branch 'feat_mydojo_whirlpool_0108' into 'develop'

upgrade whirlpool to whirlpool-cli 0.10.8

See merge request dojo/samourai-dojo!149
use-env-var-docker
kenshin-samourai 5 years ago
parent
commit
377252860b
  1. 4
      docker/my-dojo/conf/docker-whirlpool.conf.tpl
  2. 6
      docker/my-dojo/whirlpool/Dockerfile
  3. 4
      docker/my-dojo/whirlpool/restart.sh

4
docker/my-dojo/conf/docker-whirlpool.conf.tpl

@ -6,6 +6,10 @@
# Value: on | off
WHIRLPOOL_INSTALL=off
# Resynchronize mix counters on startup (startup will be slower)
# Value: on | off
WHIRLPOOL_RESYNC=off
#
# EXPERT SETTINGS

6
docker/my-dojo/whirlpool/Dockerfile

@ -51,10 +51,10 @@ RUN set -ex && \
# Install whirlpool-cli
ENV WHIRLPOOL_URL https://code.samourai.io/whirlpool/whirlpool-client-cli/uploads
ENV WHIRLPOOL_VERSION 0.10.7
ENV WHIRLPOOL_VERSION_HASH 8487fff43052fd9ad1ecd8b6856d9de9
ENV WHIRLPOOL_VERSION 0.10.8
ENV WHIRLPOOL_VERSION_HASH 7998ea5a9bb180451616809bc346b9ac
ENV WHIRLPOOL_JAR "whirlpool-client-cli-$WHIRLPOOL_VERSION-run.jar"
ENV WHIRLPOOL_SHA256 5636a7a5c578b54cfe0c19d187e91255d7473fdedd881d2a90e6a5dcad32dc25
ENV WHIRLPOOL_SHA256 62e17b6020d0821a98e99ebb773b46191770ec186ceaa3e616a428f5cafe9f49
RUN set -ex && \
cd "$WHIRLPOOL_DIR" && \

4
docker/my-dojo/whirlpool/restart.sh

@ -22,6 +22,10 @@ else
whirlpool_options+=(--cli.dojo.url="http://172.30.1.3:80/v2/")
fi
if [ "$WHIRLPOOL_RESYNC" == "on" ]; then
whirlpool_options+=(--resync)
fi
if [ "$WHIRLPOOL_DEBUG" == "on" ]; then
whirlpool_options+=(--debug)
fi

Loading…
Cancel
Save