Merge pull request #458 from quorumcontrol/remove-g3-from-docker-config

remove g3 forwarding from docker config

Author: Brandon Westcott

docker/config.toml.tpl

@@ -1,5 +1,4 @@
 NotaryGroupConfig = "${TUPELO_NOTARY_GROUP_CONFIG}"
-Gossip3NotaryGroupConfig = "${TUPELO_GOSSIP3_NOTARY_GROUP_CONFIG}"
 
 BootstrapOnly = ${TUPELO_BOOTSTRAP_ONLY}
 Namespace = "${TUPELO_NAMESPACE}"

docker/docker-entrypoint.sh

@@ -7,7 +7,6 @@ export TUPELO_BOOTSTRAP_ONLY=${TUPELO_BOOTSTRAP_ONLY:-"false"}
 export TUPELO_CONFIG_PATH=${TUPELO_CONFIG_PATH:-"/tupelo"}
 export TUPELO_CONFIG_FILE=${TUPELO_CONFIG_FILE:-"$TUPELO_CONFIG_PATH/config.toml"}
 export TUPELO_NOTARY_GROUP_CONFIG=${TUPELO_NOTARY_GROUP_CONFIG:-"$TUPELO_CONFIG_PATH/notarygroup.toml"}
-export TUPELO_GOSSIP3_NOTARY_GROUP_CONFIG=${TUPELO_GOSSIP3_NOTARY_GROUP_CONFIG:-"$TUPELO_CONFIG_PATH/gossip3_notarygroup.toml"}
 export TUPELO_STORAGE_KIND=${TUPELO_STORAGE_KIND:-"badger"}
 export TUPELO_STORAGE_PATH=${TUPELO_STORAGE_PATH:-"$TUPELO_CONFIG_PATH/data"}
 export TUPELO_CERTIFICATE_CACHE=${TUPELO_CERTIFICATE_CACHE:-"$TUPELO_CONFIG_PATH/certs"}
@@ -22,10 +21,6 @@ if [ -n "$TUPELO_NOTARY_GROUP_URL" ]; then
   wget -q -O "$TUPELO_NOTARY_GROUP_CONFIG" "$TUPELO_NOTARY_GROUP_URL"
 fi
 
-if [ -n "$TUPELO_GOSSIP3_NOTARY_GROUP_URL" ]; then
-  wget -q -O "$TUPELO_GOSSIP3_NOTARY_GROUP_CONFIG" "$TUPELO_GOSSIP3_NOTARY_GROUP_URL"
-fi
-
 if [ -n "$TUPELO_ADVERTISE_EC2_PUBLIC_IP" ]; then
   TUPELO_PUBLIC_IP=$(curl -s http://169.254.169.254/latest/meta-data/public-ipv4)
   export TUPELO_PUBLIC_IP