diff --git a/local-compose.yml b/local-compose.yml index 16263032..2705ed1a 100644 --- a/local-compose.yml +++ b/local-compose.yml @@ -99,12 +99,6 @@ api: - CONSUL=consul - PORT=3000 - RETHINK_HOST=rethinkdb - - DOCKER_HOST=$DOCKER_HOST - - DOCKER_CERT_PATH=$DOCKER_CERT_PATH - - DOCKER_CLIENT_TIMEOUT=$DOCKER_CLIENT_TIMEOUT - - SDC_URL=$SDC_URL - - SDC_ACCOUNT=$SDC_ACCOUNT - - SDC_KEY_ID=$SDC_KEY_ID expose: - 3000 diff --git a/setup.sh b/setup.sh index 3b8ccf42..5a7e13cd 100755 --- a/setup.sh +++ b/setup.sh @@ -35,6 +35,9 @@ check() { echo COMPOSE_HTTP_TIMEOUT=300 >> _env echo DOCKER_CLIENT_TIMEOUT=300 >> _env echo DOCKER_HOST=${DOCKER_HOST} >> _env + echo SDC_URL=${SDC_URL} >> _env + echo SDC_ACCOUNT=${SDC_ACCOUNT} >> _env + echo SDC_KEY_ID=${SDC_KEY_ID} >> _env echo TRITON_USER=${TRITON_USER} >> _env echo TRITON_DC=${TRITON_DC} >> _env echo TRITON_CA=$(cat "${DOCKER_CERT_PATH}"/ca.pem | tr '\n' '#') >> _env