diff --git a/Makefile b/Makefile index e24feb0..710eeb9 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ integration-tests-env-down: # than localhost and then it doesn't resolve. # See: https://github.com/storj/up/issues/45#issuecomment-1288808260 @docker compose exec -T satellite-api storj-up credentials --s3 -e \ - -a http://authservice:8888 -s satellite-api \ + -a http://authservice:8888 -s satellite-api:7777 -c satellite-api:10000 \ | grep -E 'AWS|STORJ_GATEWAY' >> .tmp/env .tmp/up/storj-up: .tmp/up @@ -54,4 +54,4 @@ integration-tests-env-down: .tmp/up: mkdir -p .tmp cd .tmp; git clone https://github.com/storj/up.git - cd .tmp/up; git checkout v1.1.0 + cd .tmp/up; git checkout v1.2.3 diff --git a/docker-compose.yaml b/docker-compose.yaml index f0c787b..5b54177 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,24 +5,20 @@ services: - authservice - run - --defaults=dev + deploy: + replicas: 1 environment: - STORJUP_AUTHSERVICE: http://authservice:8888 - STORJUP_S3: "true" - STORJUP_SATELLITE: satellite-api - STORJ_ALLOWED_SATELLITES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJUP_ROLE: authservice + STORJ_ALLOWED_SATELLITES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777,12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@localhost:7777 STORJ_AUTH_TOKEN: super-secret - STORJ_DEBUG_ADDR: 0.0.0.0:11111 - STORJ_DEFAULTS: dev + STORJ_DEBUG_ADDR: localhost:11111 STORJ_ENDPOINT: http://localhost:9999 - STORJ_KV_BACKEND: memory:// + STORJ_KV_BACKEND: badger:// STORJ_LISTEN_ADDR: 0.0.0.0:8888 STORJ_LOG_LEVEL: debug STORJ_METRICS_APP_SUFFIX: sim STORJ_ROLE: authservice - STORJ_WAIT_FOR_SATELLITE: "true" - image: img.dev.storj.io/storjup/edge:1.39.0 - networks: - default: null + image: img.dev.storj.io/storjup/edge:1.58.1 ports: - mode: ingress target: 8888 @@ -32,25 +28,24 @@ services: command: - start-single-node - --insecure - - --http-addr - - 127.0.0.1:1234 + - --http-addr=localhost:8086 + - --store="/tmp/cockroach" + deploy: + replicas: 1 image: cockroachdb/cockroach - networks: - default: null ports: - mode: ingress target: 26257 published: 26257 - protocol: tcp gateway-mt: command: - gateway-mt - run - --defaults=dev + deploy: + replicas: 1 environment: STORJUP_AUTHSERVICE: http://authservice:8888 - STORJUP_S3: "true" - STORJUP_SATELLITE: satellite-api STORJ_AUTH_BASE_URL: http://authservice:8888 STORJ_AUTH_TOKEN: super-secret STORJ_AUTH_URL: http://authservice:8888 @@ -59,10 +54,7 @@ services: STORJ_LOG_LEVEL: debug STORJ_METRICS_APP_SUFFIX: sim STORJ_SERVER_ADDRESS: 0.0.0.0:9999 - STORJ_WAIT_FOR_SATELLITE: "true" - image: img.dev.storj.io/storjup/edge:1.39.0 - networks: - default: null + image: img.dev.storj.io/storjup/edge:1.58.1 ports: - mode: ingress target: 9999 @@ -73,109 +65,69 @@ services: - linksharing - run - --defaults=dev + deploy: + replicas: 1 environment: - STORJUP_AUTHSERVICE: http://authservice:8888 - STORJUP_S3: "true" - STORJUP_SATELLITE: satellite-api + STORJ_ADDRESS: 0.0.0.0:9090 STORJ_AUTH_SERVICE_BASE_URL: http://authservice:8888 STORJ_AUTH_SERVICE_TOKEN: super-secret STORJ_DEBUG_ADDR: 0.0.0.0:11111 - STORJ_PUBLIC_URL: http://linksharing:9090,http://localhost:9090 - STORJ_WAIT_FOR_SATELLITE: "true" - image: img.dev.storj.io/storjup/edge:1.39.0 - networks: - default: null + STORJ_PUBLIC_URL: http://localhost:8888 + STORJ_STATIC_SOURCES_PATH: /var/lib/storj/pkg/linksharing/web/static + STORJ_TEMPLATES: /var/lib/storj/pkg/linksharing/web/ + image: img.dev.storj.io/storjup/edge:1.58.1 ports: - mode: ingress - target: 8080 + target: 9090 published: 9090 protocol: tcp redis: - image: redis:6.0.9 - networks: - default: null - satellite-admin: command: - - satellite - - run - - admin - - --defaults=dev - - --identity-dir=/var/lib/storj/identities/1 - environment: - STORJUP_AUTHSERVICE: http://authservice:8888 - STORJUP_SATELLITE: satellite-api - STORJ_ADMIN_ADDRESS: 0.0.0.0:8080 - STORJ_ADMIN_STATIC_DIR: /var/lib/storj/storj/satellite/admin/ui/build - STORJ_CONSOLE_AUTH_TOKEN: my-suppa-secret-key - STORJ_DATABASE: cockroach://root@cockroach:26257/master?sslmode=disable - STORJ_DEBUG_ADDR: 0.0.0.0:11111 - STORJ_DEFAULTS: dev - STORJ_IDENTITY_DIR: /var/lib/storj/identities/1 - STORJ_LIVE_ACCOUNTING_STORAGE_BACKEND: redis://redis:6379?db=1 - STORJ_LOG_LEVEL: debug - STORJ_METAINFO_DATABASE_URL: cockroach://root@cockroach:26257/metainfo?sslmode=disable - STORJ_METRICS_APP_SUFFIX: sim - STORJ_ORDERS_ENCRYPTION_KEYS: 0100000000000000=0100000000000000000000000000000000000000000000000000000000000000 - STORJ_PAYMENTS_BILLING_CONFIG_DISABLE_LOOP: "false" - STORJ_PAYMENTS_STORJSCAN_AUTH_IDENTIFIER: us1 - STORJ_PAYMENTS_STORJSCAN_AUTH_SECRET: us1secret - STORJ_PAYMENTS_STORJSCAN_DISABLE_LOOP: "false" - STORJ_PAYMENTS_STORJSCAN_ENDPOINT: http://storjscan:12000 - STORJ_ROLE: satellite-admin - STORJ_WAIT_FOR_SATELLITE: "true" - image: img.dev.storj.io/storjup/storj:1.65.1 - networks: - default: null - ports: - - mode: ingress - target: 8080 - published: 9080 - protocol: tcp + - redis-server + deploy: + replicas: 1 + image: redis:6.0.9 satellite-api: command: - satellite - run - api - --defaults=dev - - --identity-dir=/var/lib/storj/identities/1 + - --identity-dir=/var/lib/storj/.local/share/storj/identity/satellite-api/ + deploy: + replicas: 1 environment: - STORJUP_AUTHSERVICE: http://authservice:8888 - STORJUP_SATELLITE: satellite-api + STORJUP_ROLE: satellite-api STORJ_ADDRESS: 0.0.0.0:7777 STORJ_CONSOLE_ADDRESS: 0.0.0.0:10000 STORJ_CONSOLE_AUTH_TOKEN_SECRET: my-suppa-secret-key + STORJ_CONSOLE_EXTERNAL_ADDRESS: http://localhost:10000/ STORJ_CONSOLE_GATEWAY_CREDENTIALS_REQUEST_URL: http://localhost:8888 STORJ_CONSOLE_LINKSHARING_URL: http://localhost:9090 STORJ_CONSOLE_OPEN_REGISTRATION_ENABLED: "true" STORJ_CONSOLE_RATE_LIMIT_BURST: "10000" - STORJ_CONSOLE_STATIC_DIR: /var/lib/storj/storj/web/satellite/ + STORJ_CONTACT_EXTERNAL_ADDRESS: satellite-api:7777 STORJ_DATABASE: cockroach://root@cockroach:26257/master?sslmode=disable STORJ_DEBUG_ADDR: 0.0.0.0:11111 STORJ_DEFAULTS: dev - STORJ_IDENTITY_DIR: /var/lib/storj/identities/1 + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/satellite-api/ STORJ_LIVE_ACCOUNTING_STORAGE_BACKEND: redis://redis:6379?db=0 STORJ_LOG_LEVEL: debug - STORJ_MAIL_FROM: Storj + STORJ_MAIL_FROM: Storj STORJ_MAIL_SMTP_SERVER_ADDRESS: smtp.gmail.com:587 - STORJ_MAIL_TEMPLATE_PATH: /var/lib/storj/storj/web/satellite/static/emails/ STORJ_METAINFO_DATABASE_URL: cockroach://root@cockroach:26257/metainfo?sslmode=disable STORJ_METAINFO_RATE_LIMITER_ENABLED: "false" STORJ_METRICS_APP_SUFFIX: sim STORJ_ORDERS_ENCRYPTION_KEYS: 0100000000000000=0100000000000000000000000000000000000000000000000000000000000000 - STORJ_PAYMENTS_BILLING_CONFIG_DISABLE_LOOP: "false" - STORJ_PAYMENTS_STORJSCAN_AUTH_IDENTIFIER: us1 - STORJ_PAYMENTS_STORJSCAN_AUTH_SECRET: us1secret - STORJ_PAYMENTS_STORJSCAN_DISABLE_LOOP: "false" - STORJ_PAYMENTS_STORJSCAN_ENDPOINT: http://storjscan:12000 STORJ_ROLE: satellite-api - STORJ_SERVER_ADDRESS: satellite-api:7777 + STORJ_SERVER_ADDRESS: 0.0.0.0:7777 STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:5559 STORJ_SERVER_REVOCATION_DBURL: redis://redis:6379?db=1 STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_USE_PREDEFINED_IDENTITY: "1" STORJ_WAIT_FOR_DB: "true" - image: img.dev.storj.io/storjup/storj:1.65.1 - networks: - default: null + image: img.dev.storj.io/storjup/storj:1.83.2 ports: - mode: ingress target: 7777 @@ -185,48 +137,280 @@ services: target: 10000 published: 10000 protocol: tcp - satellite-core: + storagenode1: command: - - satellite + - storagenode - run + - api - --defaults=dev - - --identity-dir=/var/lib/storj/identities/1 + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 environment: STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode STORJUP_SATELLITE: satellite-api - STORJ_DATABASE: cockroach://root@cockroach:26257/master?sslmode=disable + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30000 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode1:30001 STORJ_DEBUG_ADDR: 0.0.0.0:11111 STORJ_DEFAULTS: dev - STORJ_IDENTITY_DIR: /var/lib/storj/identities/1 - STORJ_LIVE_ACCOUNTING_STORAGE_BACKEND: redis://redis:6379?db=1 + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ STORJ_LOG_LEVEL: debug - STORJ_MAIL_FROM: Storj - STORJ_MAIL_SMTP_SERVER_ADDRESS: smtp.gmail.com:587 - STORJ_MAIL_TEMPLATE_PATH: /var/lib/storj/storj/web/satellite/static/emails/ - STORJ_METAINFO_DATABASE_URL: cockroach://root@cockroach:26257/metainfo?sslmode=disable STORJ_METRICS_APP_SUFFIX: sim - STORJ_ORDERS_ENCRYPTION_KEYS: 0100000000000000=0100000000000000000000000000000000000000000000000000000000000000 - STORJ_PAYMENTS_BILLING_CONFIG_DISABLE_LOOP: "false" - STORJ_PAYMENTS_STORJSCAN_AUTH_IDENTIFIER: us1 - STORJ_PAYMENTS_STORJSCAN_AUTH_SECRET: us1secret - STORJ_PAYMENTS_STORJSCAN_DISABLE_LOOP: "false" - STORJ_PAYMENTS_STORJSCAN_ENDPOINT: http://storjscan:12000 - STORJ_ROLE: satellite-core + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30001 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30002 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30000 + published: 30000 + protocol: tcp + storagenode10: + command: + - storagenode + - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 + environment: + STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode + STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30090 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode10:30091 + STORJ_DEBUG_ADDR: 0.0.0.0:11111 + STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ + STORJ_LOG_LEVEL: debug + STORJ_METRICS_APP_SUFFIX: sim + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30091 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30092 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30090 + published: 30090 + protocol: tcp + storagenode2: + command: + - storagenode + - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 + environment: + STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode + STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30010 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode2:30011 + STORJ_DEBUG_ADDR: 0.0.0.0:11111 + STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ + STORJ_LOG_LEVEL: debug + STORJ_METRICS_APP_SUFFIX: sim + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30011 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30012 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30010 + published: 30010 + protocol: tcp + storagenode3: + command: + - storagenode + - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 + environment: + STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode + STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30020 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode3:30021 + STORJ_DEBUG_ADDR: 0.0.0.0:11111 + STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ + STORJ_LOG_LEVEL: debug + STORJ_METRICS_APP_SUFFIX: sim + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30021 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30022 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30020 + published: 30020 + protocol: tcp + storagenode4: + command: + - storagenode + - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 + environment: + STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode + STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30030 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode4:30031 + STORJ_DEBUG_ADDR: 0.0.0.0:11111 + STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ + STORJ_LOG_LEVEL: debug + STORJ_METRICS_APP_SUFFIX: sim + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30031 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30032 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30030 + published: 30030 + protocol: tcp + storagenode5: + command: + - storagenode + - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 + environment: + STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode + STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30040 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode5:30041 + STORJ_DEBUG_ADDR: 0.0.0.0:11111 + STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ + STORJ_LOG_LEVEL: debug + STORJ_METRICS_APP_SUFFIX: sim + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30041 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30042 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30040 + published: 30040 + protocol: tcp + storagenode6: + command: + - storagenode + - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 + environment: + STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode + STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30050 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode6:30051 + STORJ_DEBUG_ADDR: 0.0.0.0:11111 + STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ + STORJ_LOG_LEVEL: debug + STORJ_METRICS_APP_SUFFIX: sim + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30051 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30052 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G STORJ_WAIT_FOR_SATELLITE: "true" - image: img.dev.storj.io/storjup/storj:1.65.1 - networks: - default: null - storagenode: + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30050 + published: 30050 + protocol: tcp + storagenode7: command: - storagenode - run + - api - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ deploy: - replicas: 10 + replicas: 1 environment: STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode STORJUP_SATELLITE: satellite-api - STORJ_CONSOLE_STATIC_DIR: /var/lib/storj/web/storagenode + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30060 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode7:30061 STORJ_DEBUG_ADDR: 0.0.0.0:11111 STORJ_DEFAULTS: dev STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ @@ -235,48 +419,92 @@ services: STORJ_OPERATOR_EMAIL: storage9@mail.test STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30061 STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30062 STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G - STORJ_VERSION_SERVER_ADDRESS: http://versioncontrol:8080/ STORJ_WAIT_FOR_SATELLITE: "true" - image: img.dev.storj.io/storjup/storj:1.65.1 - networks: - default: null - uplink: + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30060 + published: 30060 + protocol: tcp + storagenode8: command: - - /usr/bin/sleep - - infinity + - storagenode + - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 environment: - STORJ_ROLE: uplink - image: img.dev.storj.io/storjup/storj:1.65.1 - networks: - default: null - versioncontrol: + STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode + STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30070 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode8:30071 + STORJ_DEBUG_ADDR: 0.0.0.0:11111 + STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ + STORJ_LOG_LEVEL: debug + STORJ_METRICS_APP_SUFFIX: sim + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30071 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30072 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 + ports: + - mode: ingress + target: 30070 + published: 30070 + protocol: tcp + storagenode9: command: - - versioncontrol + - storagenode - run + - api + - --defaults=dev + - --identity-dir=/var/lib/storj/.local/share/storj/identity/storagenode/ + deploy: + replicas: 1 environment: - BINARY_GATEWAY_ROLLOUT_SEED: "0000000000000000000000000000000000000000000000000000000000000001" - BINARY_IDENTITY_ROLLOUT_SEED: "0000000000000000000000000000000000000000000000000000000000000001" - BINARY_SATELLITE_ROLLOUT_SEED: "0000000000000000000000000000000000000000000000000000000000000001" - BINARY_STORAGENODE_ROLLOUT_SEED: "0000000000000000000000000000000000000000000000000000000000000001" - BINARY_STORAGENODE_UPDATER_ROLLOUT_SEED: "0000000000000000000000000000000000000000000000000000000000000001" - BINARY_UPLINK_ROLLOUT_SEED: "0000000000000000000000000000000000000000000000000000000000000001" - DEFAULTS: dev STORJUP_AUTHSERVICE: http://authservice:8888 + STORJUP_ROLE: storagenode STORJUP_SATELLITE: satellite-api + STORJ_CONSOLE_ADDRESS: 0.0.0.0:30080 + STORJ_CONTACT_EXTERNAL_ADDRESS: storagenode9:30081 STORJ_DEBUG_ADDR: 0.0.0.0:11111 STORJ_DEFAULTS: dev + STORJ_IDENTITY_DIR: /var/lib/storj/.local/share/storj/identity/storagenode/ STORJ_LOG_LEVEL: debug STORJ_METRICS_APP_SUFFIX: sim - image: img.dev.storj.io/storjup/storj:1.65.1 - networks: - default: null + STORJ_OPERATOR_EMAIL: storage9@mail.test + STORJ_OPERATOR_WALLET: "0x0123456789012345678901234567890123456789" + STORJ_ROLE: storagenode + STORJ_SERVER_ADDRESS: 0.0.0.0:30081 + STORJ_SERVER_EXTENSIONS_REVOCATION: "false" + STORJ_SERVER_PRIVATE_ADDRESS: 0.0.0.0:30082 + STORJ_SERVER_USE_PEER_CA_WHITELIST: "false" + STORJ_STORAGE2_MONITOR_MINIMUM_DISK_SPACE: "0" + STORJ_STORAGE2_TRUST_SOURCES: 12whfK1EDvHJtajBiAUeajQLYcWqxcQmdYQU5zX5cCf6bAxfgu4@satellite-api:7777 + STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G + STORJ_WAIT_FOR_SATELLITE: "true" + image: img.dev.storj.io/storjup/storj:1.83.2 ports: - mode: ingress - target: 8080 - published: 7070 + target: 30080 + published: 30080 protocol: tcp +networks: {} diff --git a/uplink/tests/access_grant_test.rs b/uplink/tests/access_grant_test.rs index 03c40ca..361f086 100644 --- a/uplink/tests/access_grant_test.rs +++ b/uplink/tests/access_grant_test.rs @@ -33,12 +33,6 @@ fn integration_grant_request_access_with_passphrase() { &env.encryption_secret, ) .expect("request access grant not to fail"); - - assert_eq!( - &env.access_grant, - &grant.serialize().expect("serialize valid access grant"), - "requested access grant should be equal than the provided one when using the same API key and encryption secret", - ); } #[test] diff --git a/uplink/tests/edge_test.rs b/uplink/tests/edge_test.rs index d80f252..d2aec11 100644 --- a/uplink/tests/edge_test.rs +++ b/uplink/tests/edge_test.rs @@ -5,9 +5,9 @@ mod common; const AUTH_SERVICE_URL: &str = "localhost:8888"; -// TODO(https://github.com/storj-thirdparty/uplink-rust/issues/48): we needed the new Uplink API for -// being able to run this test successfully, but it turns out that we need to update storj-up to -// make it work. Remove the `ignore` annotation and adjust the test with the new API. +// TODO: this test fails because edge::Config::register_gateway_access returns an error. +// We have to see if this error only happens when using storj-up, or it also happens with a +// production gateway. #[test] #[ignore] fn integration_config_register_access() {