Feature: Upload via TUS

dev-tools/compose/docker-compose.api.yml

@@ -13,7 +13,8 @@ services:
         condition: service_healthy
     ports:
       - 1323:1323
-    command: ['/bin/sh', '-c', 'bridge es-indexer drop && bridge']
+    command:
+      ["/bin/sh", "-c", "bridge es-indexer drop && runMigrations=true bridge"]
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
@@ -25,15 +26,15 @@ services:
       - node.name=cluster1-node1
       - xpack.license.self_generated.type=basic
       - xpack.security.enabled=false
-      - 'ES_JAVA_OPTS=-Xms512m -Xmx512m'
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ulimits:
       memlock:
         soft: -1
         hard: -1
     ports:
       - 9200:9200
     healthcheck:
-      test: ['CMD', 'curl', '-f', 'http://localhost:9200']
+      test: ["CMD", "curl", "-f", "http://localhost:9200"]
       interval: 10s
       timeout: 10s
       retries: 20

dev-tools/compose/docker-compose.dev-tools.prod.yml

@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 
 services:
   ingress:
@@ -7,8 +7,11 @@ services:
     volumes:
       - ./nginx_ingress.conf:/etc/nginx/conf.d/default.conf
       - ${PROJECT_ROOT}/comms/nginx/ingress.conf:/usr/local/openresty/nginx/conf/comms_ingress.conf
+      - ../tls/cert.pem:/tmp/cert.pem
+      - ../tls/key.pem:/tmp/key.pem
     ports:
       - 80:80
+      - 443:443
 
   autoheal:
     image: willfarrell/autoheal:latest
@@ -23,33 +26,33 @@ services:
   audius-cmd:
     build:
       args:
-        TURBO_TEAM: '${TURBO_TEAM:-}'
-        TURBO_TOKEN: '${TURBO_TOKEN:-}'
+        TURBO_TEAM: "${TURBO_TEAM:-}"
+        TURBO_TOKEN: "${TURBO_TOKEN:-}"
       context: ${PROJECT_ROOT}
       dockerfile: ${PROJECT_ROOT}/packages/commands/Dockerfile.prod
     environment:
-      ETH_TOKEN_ADDRESS: '${ETH_TOKEN_ADDRESS}'
-      ETH_REGISTRY_ADDRESS: '${ETH_REGISTRY_ADDRESS}'
-      ETH_PROVIDER_URL: 'http://eth-ganache:8545'
-      ETH_OWNER_WALLET: '${ETH_OWNER_WALLET}'
+      ETH_TOKEN_ADDRESS: "${ETH_TOKEN_ADDRESS}"
+      ETH_REGISTRY_ADDRESS: "${ETH_REGISTRY_ADDRESS}"
+      ETH_PROVIDER_URL: "http://eth-ganache:8545"
+      ETH_OWNER_WALLET: "${ETH_OWNER_WALLET}"
 
-      POA_REGISTRY_ADDRESS: '${POA_REGISTRY_ADDRESS}'
-      ENTITY_MANAGER_ADDRESS: '${ENTITY_MANAGER_ADDRESS}'
-      POA_PROVIDER_URL: 'http://poa-ganache:8545'
+      POA_REGISTRY_ADDRESS: "${POA_REGISTRY_ADDRESS}"
+      ENTITY_MANAGER_ADDRESS: "${ENTITY_MANAGER_ADDRESS}"
+      POA_PROVIDER_URL: "http://poa-ganache:8545"
 
-      SOLANA_ENDPOINT: 'http://solana-test-validator:8899'
-      SOLANA_OWNER_SECRET_KEY: '${SOLANA_OWNER_SECRET_KEY}'
-      SOLANA_TOKEN_MINT_PUBLIC_KEY: '${SOLANA_TOKEN_MINT_PUBLIC_KEY}'
-      SOLANA_USDC_TOKEN_MINT_PUBLIC_KEY: '${SOLANA_USDC_TOKEN_MINT_PUBLIC_KEY}'
-      SOLANA_CLAIMABLE_TOKENS_PUBLIC_KEY: '${SOLANA_CLAIMABLE_TOKENS_PUBLIC_KEY}'
-      SOLANA_REWARD_MANAGER_PUBLIC_KEY: '${SOLANA_REWARD_MANAGER_PUBLIC_KEY}'
-      SOLANA_REWARD_MANAGER_PDA_PUBLIC_KEY: '${SOLANA_REWARD_MANAGER_PDA_PUBLIC_KEY}'
-      SOLANA_REWARD_MANAGER_TOKEN_PDA_PUBLIC_KEY: '${SOLANA_REWARD_MANAGER_TOKEN_PDA_PUBLIC_KEY}'
-      SOLANA_PAYMENT_ROUTER_PUBLIC_KEY: '${SOLANA_PAYMENT_ROUTER_PUBLIC_KEY}'
-      SOLANA_FEEPAYER_SECRET_KEY: '${SOLANA_FEEPAYER_SECRET_KEY}'
+      SOLANA_ENDPOINT: "http://solana-test-validator:8899"
+      SOLANA_OWNER_SECRET_KEY: "${SOLANA_OWNER_SECRET_KEY}"
+      SOLANA_TOKEN_MINT_PUBLIC_KEY: "${SOLANA_TOKEN_MINT_PUBLIC_KEY}"
+      SOLANA_USDC_TOKEN_MINT_PUBLIC_KEY: "${SOLANA_USDC_TOKEN_MINT_PUBLIC_KEY}"
+      SOLANA_CLAIMABLE_TOKENS_PUBLIC_KEY: "${SOLANA_CLAIMABLE_TOKENS_PUBLIC_KEY}"
+      SOLANA_REWARD_MANAGER_PUBLIC_KEY: "${SOLANA_REWARD_MANAGER_PUBLIC_KEY}"
+      SOLANA_REWARD_MANAGER_PDA_PUBLIC_KEY: "${SOLANA_REWARD_MANAGER_PDA_PUBLIC_KEY}"
+      SOLANA_REWARD_MANAGER_TOKEN_PDA_PUBLIC_KEY: "${SOLANA_REWARD_MANAGER_TOKEN_PDA_PUBLIC_KEY}"
+      SOLANA_PAYMENT_ROUTER_PUBLIC_KEY: "${SOLANA_PAYMENT_ROUTER_PUBLIC_KEY}"
+      SOLANA_FEEPAYER_SECRET_KEY: "${SOLANA_FEEPAYER_SECRET_KEY}"
 
-      IDENTITY_SERVICE_URL: 'http://identity-service:7000'
-      FALLBACK_CREATOR_NODE_URL: 'http://creator-node:4000' # this should choose a random cn everytime this is run
+      IDENTITY_SERVICE_URL: "http://identity-service:7000"
+      FALLBACK_CREATOR_NODE_URL: "http://creator-node:4000" # this should choose a random cn everytime this is run
     deploy:
       mode: global
     volumes:

dev-tools/compose/docker-compose.oap.yml

@@ -0,0 +1,100 @@
+services:
+  openaudio-1:
+    image: ${OPENAUDIO_IMAGE:-openaudio/go-openaudio:dev}
+    restart: unless-stopped
+    env_file:
+      - ../environment/openaudio-1.env
+    extra_hosts:
+      - "node1.oap.devnet:host-gateway"
+      - "node2.oap.devnet:host-gateway"
+      - "node3.oap.devnet:host-gateway"
+      - "node4.oap.devnet:host-gateway"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://node1.oap.devnet/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+    volumes:
+      - ./cmd:/app/cmd
+      - ./pkg:/app/pkg
+      - ./go.mod:/app/go.mod
+      - ./go.sum:/app/go.sum
+    profiles:
+      - discovery
+      - storage
+
+  openaudio-2:
+    image: ${OPENAUDIO_IMAGE:-openaudio/go-openaudio:dev}
+    restart: unless-stopped
+    env_file:
+      - ../environment/openaudio-2.env
+    extra_hosts:
+      - "node1.oap.devnet:host-gateway"
+      - "node2.oap.devnet:host-gateway"
+      - "node3.oap.devnet:host-gateway"
+      - "node4.oap.devnet:host-gateway"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://node2.oap.devnet/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+    volumes:
+      - ./cmd:/app/cmd
+      - ./pkg:/app/pkg
+      - ./go.mod:/app/go.mod
+      - ./go.sum:/app/go.sum
+    profiles:
+      - discovery
+      - storage
+
+  openaudio-3:
+    image: ${OPENAUDIO_IMAGE:-openaudio/go-openaudio:dev}
+    restart: unless-stopped
+    env_file:
+      - ../environment/openaudio-3.env
+    extra_hosts:
+      - "node1.oap.devnet:host-gateway"
+      - "node2.oap.devnet:host-gateway"
+      - "node3.oap.devnet:host-gateway"
+      - "node4.oap.devnet:host-gateway"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://node3.oap.devnet/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+    volumes:
+      - ./cmd:/app/cmd
+      - ./pkg:/app/pkg
+      - ./go.mod:/app/go.mod
+      - ./go.sum:/app/go.sum
+    profiles:
+      - discovery
+      - storage
+
+  openaudio-4:
+    image: ${OPENAUDIO_IMAGE:-openaudio/go-openaudio:dev}
+    restart: unless-stopped
+    env_file:
+      - ../environment/openaudio-4.env
+    extra_hosts:
+      - "node1.oap.devnet:host-gateway"
+      - "node2.oap.devnet:host-gateway"
+      - "node3.oap.devnet:host-gateway"
+      - "node4.oap.devnet:host-gateway"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://node4.oap.devnet/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 5s
+    volumes:
+      - ./cmd:/app/cmd
+      - ./pkg:/app/pkg
+      - ./go.mod:/app/go.mod
+      - ./go.sum:/app/go.sum
+    profiles:
+      - discovery
+      - storage

dev-tools/compose/docker-compose.yml

@@ -1,31 +1,35 @@
-version: '3.9'
+version: "3.9"
 
 # TODO: Run nethermind in a container called `chain` like https://github.com/AudiusProject/audius-docker-compose/blob/main/discovery-provider/docker-compose.yml#L247
 # This has never existed locally but seems to break discovery indexing when signing up now (was previously working)
 
 x-common: &common
   logging:
     options:
-      max-size: '50m'
-      max-file: '3'
+      max-size: "50m"
+      max-file: "3"
     driver: json-file
   extra_hosts:
     # Allows the containers can talk to each other via their hostnames routed through nginx
-    - 'audius-comms-1:host-gateway'
-    - 'audius-comms-2:host-gateway'
-    - 'audius-comms-3:host-gateway'
-    - 'audius-creator-node-1:host-gateway'
-    - 'audius-creator-node-2:host-gateway'
-    - 'audius-creator-node-3:host-gateway'
-    - 'audius-discovery-provider-1:host-gateway'
-    - 'audius-discovery-provider-2:host-gateway'
-    - 'audius-discovery-provider-3:host-gateway'
-    - 'audius-identity-service-1:host-gateway'
-    - 'audius-solana-test-validator-1:host-gateway'
-    - 'audius-eth-ganache-1:host-gateway'
-    - 'audius-pedalboard:host-gateway'
-    - 'audius-api:host-gateway'
-    - 'audius-api-elasticsearch:host-gateway'
+    - "audius-comms-1:host-gateway"
+    - "audius-comms-2:host-gateway"
+    - "audius-comms-3:host-gateway"
+    - "audius-creator-node-1:host-gateway"
+    - "audius-creator-node-2:host-gateway"
+    - "audius-creator-node-3:host-gateway"
+    - "audius-discovery-provider-1:host-gateway"
+    - "audius-discovery-provider-2:host-gateway"
+    - "audius-discovery-provider-3:host-gateway"
+    - "audius-identity-service-1:host-gateway"
+    - "audius-solana-test-validator-1:host-gateway"
+    - "audius-eth-ganache-1:host-gateway"
+    - "audius-pedalboard:host-gateway"
+    - "audius-api:host-gateway"
+    - "audius-api-elasticsearch:host-gateway"
+    - "node1.oap.devnet:host-gateway"
+    - "node2.oap.devnet:host-gateway"
+    - "node3.oap.devnet:host-gateway"
+    - "node4.oap.devnet:host-gateway"
   deploy:
     resources:
       limits:
@@ -48,15 +52,15 @@ services:
       - 5432:5432
       - 5454:5432
     environment:
-      PGUSER: 'postgres'
-      POSTGRES_PASSWORD: 'postgres'
+      PGUSER: "postgres"
+      POSTGRES_PASSWORD: "postgres"
     volumes:
       - ../startup/initdb:/docker-entrypoint-initdb.d
       - postgresdata:/var/lib/postgresql/data
     <<: *common
     healthcheck:
       # identity_service is the last db to be created in init-db.sql
-      test: ['CMD', 'pg_isready', '--dbname', 'identity_service']
+      test: ["CMD", "pg_isready", "--dbname", "identity_service"]
       interval: 10s
       timeout: 5s
 
@@ -85,41 +89,30 @@ services:
       - ${PROJECT_ROOT}/dev-tools/environment/api.env
     <<: *common
 
-  # Validators
-  audiusd-1:
+  # Validator Nodes
+  openaudio-1:
     extends:
-      file: docker-compose.audiusd.yml
-      service: audiusd
-    container_name: audiusd-1
-    env_file:
-      - ${PROJECT_ROOT}/dev-tools/environment/audiusd-1.env
+      file: docker-compose.oap.yml
+      service: openaudio-1
+    container_name: openaudio-1
     <<: *common
-
-  audiusd-2:
+  openaudio-2:
     extends:
-      file: docker-compose.audiusd.yml
-      service: audiusd
-    container_name: audiusd-2
-    env_file:
-      - ${PROJECT_ROOT}/dev-tools/environment/audiusd-2.env
+      file: docker-compose.oap.yml
+      service: openaudio-2
+    container_name: openaudio-2
     <<: *common
-
-  audiusd-3:
+  openaudio-3:
     extends:
-      file: docker-compose.audiusd.yml
-      service: audiusd
-    container_name: audiusd-3
-    env_file:
-      - ${PROJECT_ROOT}/dev-tools/environment/audiusd-3.env
+      file: docker-compose.oap.yml
+      service: openaudio-3
+    container_name: openaudio-3
     <<: *common
-
-  audiusd-4:
+  openaudio-4:
     extends:
-      file: docker-compose.audiusd.yml
-      service: audiusd
-    container_name: audiusd-4
-    env_file:
-      - ${PROJECT_ROOT}/dev-tools/environment/audiusd-4.env
+      file: docker-compose.oap.yml
+      service: openaudio-4
+    container_name: openaudio-4
     <<: *common
 
   # Identity