Merge pull request #289 from radixdlt/hotfix/rpnv1-815-no-fail-no-errors

Revert fail on missing env vars
radixdlt · Dec 7, 2020 · e03712f · e03712f
2 parents e7d175d + 1aee6ab
commit e03712f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/docker/core.yml b/docker/core.yml
@@ -8,7 +8,7 @@ services:
     environment:
       RADIXDLT_PACEMAKER_TIMEOUT_MILLIS: 1000
       RADIXDLT_LOG_LEVEL: debug
-      RADIXDLT_UNIVERSE: ${RADIXDLT_UNIVERSE:?err}
+      RADIXDLT_UNIVERSE: ${RADIXDLT_UNIVERSE}
       JAVA_OPTS: -server -Xmx512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError -XX:+AlwaysPreTouch -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -Dcom.sun.management.jmxremote.port=9011 -Dcom.sun.management.jmxremote.rmi.port=9011 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -agentlib:jdwp=transport=dt_socket,address=50505,suspend=n,server=y
     image: radixdlt/radixdlt-core:develop
     labels:

diff --git a/docker/faucet.yml b/docker/faucet.yml
@@ -6,8 +6,8 @@ services:
       context: .
       dockerfile: Dockerfile.faucet
     environment:
-      FAUCET_TOKEN_RRI: ${RADIXDLT_UNIVERSE_TOKEN:?err}
-      FAUCET_IDENTITY_KEY: ${RADIXDLT_UNIVERSE_PRIVKEY:?err}
+      FAUCET_TOKEN_RRI: ${RADIXDLT_UNIVERSE_TOKEN}
+      FAUCET_IDENTITY_KEY: ${RADIXDLT_UNIVERSE_PRIVKEY}
       RADIX_BOOTSTRAP_TRUSTED_NODE: http://core0:8080
       JAVA_OPTS: -server -XX:+HeapDumpOnOutOfMemoryError -Xms512m -Xmx512m -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/urandom
     image: radixdlt/faucet:develop

diff --git a/docker/node-1.yml b/docker/node-1.yml
@@ -7,7 +7,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core0
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY}
     networks:
       - single_node
     ports:

diff --git a/docker/node-2.yml b/docker/node-2.yml
@@ -7,7 +7,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core0
       RADIXDLT_NETWORK_SEEDS_REMOTE: core1
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY}
     networks:
       - two_nodes
     ports:
@@ -24,7 +24,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core1
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY}
     networks:
       - two_nodes
     ports:

diff --git a/docker/node-3.yml b/docker/node-3.yml
@@ -7,7 +7,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core0
       RADIXDLT_NETWORK_SEEDS_REMOTE: core1,core2
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY}
     networks:
       - three_nodes
     ports:
@@ -24,7 +24,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core1
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core2
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY}
     networks:
       - three_nodes
     ports:
@@ -38,7 +38,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core2
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core1
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_2_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_2_PRIVKEY}
     networks:
       - three_nodes
     ports:

diff --git a/docker/node-4.yml b/docker/node-4.yml
@@ -7,7 +7,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core0
       RADIXDLT_NETWORK_SEEDS_REMOTE: core1,core2,core3
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY}
     networks:
       - four_nodes
     ports:
@@ -24,7 +24,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core1
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core2,core3
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY}
     networks:
       - four_nodes
     ports:
@@ -38,7 +38,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core2
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core1,core3
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_2_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_2_PRIVKEY}
     networks:
       - four_nodes
     ports:
@@ -52,7 +52,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core3
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core1,core2
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_3_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_3_PRIVKEY}
     networks:
       - four_nodes
     ports:

diff --git a/docker/node-5.yml b/docker/node-5.yml
@@ -7,7 +7,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core0
       RADIXDLT_NETWORK_SEEDS_REMOTE: core1,core2,core3,core4
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_0_PRIVKEY}
     networks:
       - five_nodes
     ports:
@@ -24,7 +24,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core1
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core2,core3,core4
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_1_PRIVKEY}
     networks:
       - five_nodes
     ports:
@@ -38,7 +38,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core2
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core1,core3,core4
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_2_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_2_PRIVKEY}
     networks:
       - five_nodes
     ports:
@@ -52,7 +52,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core3
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core1,core2,core4
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_3_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_3_PRIVKEY}
     networks:
       - five_nodes
     ports:
@@ -66,7 +66,7 @@ services:
     environment:
       RADIXDLT_HOST_IP_ADDRESS: core4
       RADIXDLT_NETWORK_SEEDS_REMOTE: core0,core1,core2,core3
-      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_4_PRIVKEY:?err}
+      RADIXDLT_NODE_KEY: ${RADIXDLT_VALIDATOR_4_PRIVKEY}
     networks:
       - five_nodes
     ports: