diff --git a/cmd/satellite/Dockerfile b/cmd/satellite/Dockerfile index e356c9b55..6bbda6f2b 100644 --- a/cmd/satellite/Dockerfile +++ b/cmd/satellite/Dockerfile @@ -7,7 +7,6 @@ FROM storjlabs/golang as build-env FROM alpine ENV API_KEY= \ CONF_PATH=/root/.local/share/storj/satellite \ - OVERLAY_URL=redis://redis:6379/?db=0 \ BOOTSTRAP_ADDR=bootstrap.storj.io:8080 EXPOSE 7776/udp \ 7777 \ diff --git a/cmd/satellite/entrypoint b/cmd/satellite/entrypoint index cb5af619b..e8c5a1441 100755 --- a/cmd/satellite/entrypoint +++ b/cmd/satellite/entrypoint @@ -7,10 +7,6 @@ fi RUN_PARAMS="${RUN_PARAMS:-} --config-dir ${CONF_PATH}" -if [[ -n "${OVERLAY_URL:-}" ]]; then - RUN_PARAMS="${RUN_PARAMS} --overlay.database-url ${OVERLAY_URL}" -fi - if [[ -n "${API_KEY}" ]]; then export STORJ_POINTER_DB_AUTH_API_KEY="${API_KEY}" fi diff --git a/docker-compose.yaml b/docker-compose.yaml index ea3d5ca82..a34aa7c53 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -21,13 +21,16 @@ services: - API_KEY=abc123 - BOOTSTRAP_ADDR=localhost:8080 - STORJ_LOG_LEVEL=debug - - STORJ_CHECKER_QUEUE_ADDRESS=redis://redis:6379/?db=1 - - STORJ_REPAIRER_QUEUE_ADDRESS=redis://redis:6379/?db=1 + - STORJ_CHECKER_QUEUE_ADDRESS=redis://redis:6379/?db=0 + - STORJ_REPAIRER_QUEUE_ADDRESS=redis://redis:6379/?db=0 + - STORJ_DATABASE=postgres://postgres:postgres@postgres/satellite?sslmode=disable restart: always links: - redis + - postgres depends_on: - redis + - postgres storagenode: image: storjlabs/storagenode:${VERSION} environment: @@ -52,3 +55,9 @@ services: - storagenode redis: image: redis + postgres: + image: postgres:11.1 + environment: + - POSTGRES_PASSWORD=postgres + - POSTGRES_USER=postgres + - POSTGRES_DB=satellite