JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for latest code changes (#817)

Browse Source
This commit is contained in:
Matt Robinson 2018-12-11 08:05:33 -05:00 committed by GitHub
parent 8e14d2cb94
commit 32fdce7735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/gateway/entrypoint
View File

@ -8,12 +8,12 @@ fi
RUN_PARAMS="${RUN_PARAMS:-} --config ${CONF_PATH}"
if [[ -n "${API_KEY}" ]]; then
RUN_PARAMS="${RUN_PARAMS} --api-key ${API_KEY}"
RUN_PARAMS="${RUN_PARAMS} --client.api-key ${API_KEY}"
fi
if [ -n "${SATELLITE_ADDR:-}" ]; then
RUN_PARAMS="${RUN_PARAMS} --overlay-addr $SATELLITE_ADDR"
RUN_PARAMS="${RUN_PARAMS} --pointer-db-addr $SATELLITE_ADDR"
RUN_PARAMS="${RUN_PARAMS} --client.overlay-addr $SATELLITE_ADDR"
RUN_PARAMS="${RUN_PARAMS} --client.pointer-db-addr $SATELLITE_ADDR"
fi
exec ./gateway run $RUN_PARAMS "$@"

1
cmd/satellite/Dockerfile
View File

@ -8,7 +8,6 @@ FROM alpine
ENV API_KEY= \
CONF_PATH=/root/.local/share/storj/satellite/config.yaml \
OVERLAY_URL=redis://redis:6379/?db=0 \
IDENTITY_ADDR=:7777 \
BOOTSTRAP_ADDR=bootstrap.storj.io:8080 \
STORJ_MOCK_OVERLAY_NODES=
EXPOSE 7776/udp \

2
cmd/satellite/entrypoint
View File

@ -11,8 +11,6 @@ if [[ -n "${OVERLAY_URL:-}" ]]; then
RUN_PARAMS="${RUN_PARAMS} --overlay.database-url ${OVERLAY_URL}"
fi
RUN_PARAMS="${RUN_PARAMS} --identity.address=${IDENTITY_ADDR}"
if [[ -n "${API_KEY}" ]]; then
export STORJ_POINTER_DB_AUTH_API_KEY="${API_KEY}"
fi

5
docker-compose.yaml
View File

@ -20,7 +20,6 @@ services:
environment:
- API_KEY=abc123
- BOOTSTRAP_ADDR=localhost:8080
- IDENTITY_ADDR=satellite:7777
- STORJ_LOG_LEVEL=debug
- STORJ_CHECKER_QUEUE_ADDRESS=redis://redis:6379/?db=1
- STORJ_REPAIRER_QUEUE_ADDRESS=redis://redis:6379/?db=1
@ -34,13 +33,13 @@ services:
environment:
- SATELLITE_ADDR=satellite:7777
- STORJ_LOG_LEVEL=debug
- STORJ_IDENTITY_ADDRESS=storagenode:7777
- STORJ_IDENTITY_SERVER_ADDRESS=storagenode:7777
restart: always
links:
- satellite
gateway:
image: storjlabs/gateway:${VERSION}
command: --min-threshold 1 --max-threshold 2 --repair-threshold 1 --success-threshold 1
command: --rs.min-threshold 1 --rs.max-threshold 2 --rs.repair-threshold 1 --rs.success-threshold 1
environment:
- API_KEY=abc123
- SATELLITE_ADDR=satellite:7777