From 346bc4ab4fccc659f46d0b6114cb4925b3077384 Mon Sep 17 00:00:00 2001
From: Angel Rodriguez <anxolin@gmail.com>
Date: Tue, 6 Nov 2018 20:19:56 +0100
Subject: [PATCH] Change default images used for CLI

---
 conf/local.conf.example | 15 +++++++++++----
 util/base-bots.sh       |  4 ++++
 util/base.sh            |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/conf/local.conf.example b/conf/local.conf.example
index 05be91b..b557250 100644
--- a/conf/local.conf.example
+++ b/conf/local.conf.example
@@ -23,15 +23,22 @@ DEFAULT_MNEMONIC="this is your local private mnemonic no body should know about"
 MNEMONIC="${MNEMONIC:-$DEFAULT_MNEMONIC}"
 
 # Version
+#   - IMPORTANT: For PRODUCTION environemt use a fixed version (especially if you use the bots)
 #   - You can use any version in https://hub.docker.com/r/gnosispm/dx-services/tags/
-#   - By default it uses master, because it's the last stable version
-#   - You can set it to to a fixed version (i.e. v0.6.12)
-#   - You can use latest unstable version: development
-DX_SERVICE_VERSION=staging
+#       - You can set it to to a fixed version (i.e. v0.7.9) 
+#       - You can use latest unastable version: development
+#       - You can use the master branch: staging
+#DX_SERVICE_VERSION=v0.7.9
 
 # Increase debug messages
 #DEBUG_MESSAGES=DEBUG=ERROR-*,WARN-*,INFO-*,DEBUG-*
 
+# Show colors in the logged messages
+#SHOW_COLORS=true
+
+# Node
+#ETHEREUM_RPC_URL="https://${NETWORK}.infura.io"
+
 # Optionally, you can add env vars in your local conf
 # For example:
 #   - Change the default gas price used from average to safeLow or fast
diff --git a/util/base-bots.sh b/util/base-bots.sh
index ed8721a..39641a7 100644
--- a/util/base-bots.sh
+++ b/util/base-bots.sh
@@ -18,6 +18,10 @@ BOTS_CONTAINER_CONF_DIR=/usr/src/app/custom_conf
 BOTS_CONFIG_INFO="Bots config file: $BOTS_CONF_FILE"
 BOTS_LOCAL_CONF_DIR="$(pwd)/$BOTS_CONF_DIR"
 
+# For PRO, please use fixed version
+#   https://hub.docker.com/r/gnosispm/dx-services/tags/
+DX_SERVICE_VERSION=${DX_SERVICE_VERSION:-stable}
+
 # Extra config for the bots
 read -r -d '' DOCKER_PARAMS_BOTS << EOM
  --mount type=bind,source=$BOTS_LOCAL_CONF_DIR,destination=$BOTS_CONTAINER_CONF_DIR
diff --git a/util/base.sh b/util/base.sh
index cd587e9..def911b 100755
--- a/util/base.sh
+++ b/util/base.sh
@@ -14,7 +14,7 @@
 # Config
 NETWORK=${NETWORK:-rinkeby}
 ETHEREUM_RPC_URL="https://${NETWORK}.infura.io"
-DX_SERVICE_VERSION=staging # Check: https://hub.docker.com/r/gnosispm/dx-services/tags/
+DX_SERVICE_VERSION=${DX_SERVICE_VERSION:-staging} # Check: https://hub.docker.com/r/gnosispm/dx-services/tags/
 SHOW_COLORS=true
 DEBUG_MESSAGES=DEBUG=ERROR-*,WARN-*,INFO-*
 ENVIRONMENT=pro  # local, pre, pro