From 2dbc06f7e1d958bd2b86ceed92bb12d6b3b0d248 Mon Sep 17 00:00:00 2001 From: Timothy Adams Date: Mon, 28 Jan 2019 07:53:16 -0500 Subject: [PATCH] fixing entrypoint script looking for invalid flag (#1147) * fixing entrypoint script looking for invalid flag * fixed other entrypoints * removed ca_difficulty entries from compose.yaml --- cmd/gateway/entrypoint | 3 --- cmd/satellite/entrypoint | 3 --- cmd/storagenode/entrypoint | 3 --- docker-compose.yaml | 3 --- 4 files changed, 12 deletions(-) diff --git a/cmd/gateway/entrypoint b/cmd/gateway/entrypoint index 9a3327833..90def6db1 100755 --- a/cmd/gateway/entrypoint +++ b/cmd/gateway/entrypoint @@ -2,9 +2,6 @@ set -euo pipefail if [[ ! -f "${CONF_PATH}/config.yaml" ]]; then - if [[ -n "${CA_DIFFICULTY:-}" ]]; then - SETUP_PARAMS="--ca.difficulty ${CA_DIFFICULTY}" - fi ./gateway setup fi diff --git a/cmd/satellite/entrypoint b/cmd/satellite/entrypoint index 9a8d84195..36d2832f1 100755 --- a/cmd/satellite/entrypoint +++ b/cmd/satellite/entrypoint @@ -26,9 +26,6 @@ if [[ -n "${BOOTSTRAP_ADDR:-}" ]]; then fi if [[ ! -f "${CONF_PATH}/config.yaml" ]]; then - if [[ -n "${CA_DIFFICULTY:-}" ]]; then - SETUP_PARAMS="--ca.difficulty ${CA_DIFFICULTY}" - fi ./satellite setup $SETUP_PARAMS fi diff --git a/cmd/storagenode/entrypoint b/cmd/storagenode/entrypoint index d149e63c6..15f4c3e5c 100755 --- a/cmd/storagenode/entrypoint +++ b/cmd/storagenode/entrypoint @@ -2,9 +2,6 @@ set -euo pipefail if [[ ! -f "${CONF_PATH}/config.yaml" ]]; then - if [[ -n "${CA_DIFFICULTY:-}" ]]; then - SETUP_PARAMS="--ca.difficulty ${CA_DIFFICULTY}" - fi ./storagenode setup fi diff --git a/docker-compose.yaml b/docker-compose.yaml index 50eb02c79..87825d717 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,7 +18,6 @@ services: satellite: image: storjlabs/satellite:${VERSION:-latest} environment: - - CA_DIFFICULTY=4 - API_KEY=abc123 - BOOTSTRAP_ADDR=localhost:8080 - STORJ_CHECKER_QUEUE_ADDRESS=redis://redis:6379/?db=0 @@ -38,7 +37,6 @@ services: storagenode: image: storjlabs/storagenode:${VERSION:-latest} environment: - - CA_DIFFICULTY=4 - SATELLITE_ADDR=satellite:7777 - STORJ_KADEMLIA_EXTERNAL_ADDRESS=storagenode:7777 - STORJ_KADEMLIA_OPERATOR_EMAIL=hello@storj.io @@ -51,7 +49,6 @@ services: image: storjlabs/gateway:${VERSION:-latest} command: --rs.min-threshold 1 --rs.max-threshold 1 --rs.repair-threshold 1 --rs.success-threshold 1 environment: - - CA_DIFFICULTY=4 - API_KEY=abc123 - SATELLITE_ADDR=satellite:7777 - STORJ_LOG_LEVEL=debug