diff --git a/docker-compose-host-testnet.yml b/docker-compose-host-testnet.yml index 06df6398..25f6076c 100644 --- a/docker-compose-host-testnet.yml +++ b/docker-compose-host-testnet.yml @@ -2,7 +2,8 @@ version: "3" services: server_manager: - image: cartesi/rollups-host-runner:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-host-runner ports: - "5004:5004" environment: diff --git a/docker-compose-host.yml b/docker-compose-host.yml index 24c81444..af844f08 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -2,7 +2,8 @@ version: "3" services: server_manager: - image: cartesi/rollups-host-runner:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-host-runner ports: - "5004:5004" environment: diff --git a/docker-compose-testnet.yml b/docker-compose-testnet.yml index 21a1b7cb..623e8c23 100644 --- a/docker-compose-testnet.yml +++ b/docker-compose-testnet.yml @@ -2,15 +2,12 @@ version: "3.9" x-credentials: &postgres-config - POSTGRES_HOSTNAME: database - POSTGRES_PORT: "5432" - POSTGRES_USER: postgres - POSTGRES_PASSWORD: password - POSTGRES_DB: postgres + POSTGRES_ENDPOINT: postgres://postgres:password@database:5432/postgres services: dispatcher: - image: cartesi/rollups-dispatcher:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-dispatcher restart: always depends_on: state_server: @@ -34,7 +31,8 @@ services: - ./deployments:/deployments:ro state_server: - image: cartesi/rollups-state-server:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-state-server restart: always healthcheck: test: [ "CMD-SHELL", "bash -c 'echo \"\" > /dev/tcp/127.0.0.1/50051;'" ] @@ -50,7 +48,8 @@ services: BH_BLOCK_TIMEOUT: 120 advance_runner: - image: cartesi/rollups-advance-runner:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-advance-runner restart: always healthcheck: test: [ "CMD", "curl", "--fail", "localhost:8080/healthz" ] @@ -68,6 +67,7 @@ services: environment: RUST_LOG: info SERVER_MANAGER_ENDPOINT: http://server_manager:5001 + PROVIDER_HTTP_ENDPOINT: ${RPC_URL:?undefined RPC_URL} SESSION_ID: default_rollups_id REDIS_ENDPOINT: redis://redis:6379 CHAIN_ID: ${CHAIN_ID:?undefined CHAIN_ID} @@ -89,7 +89,8 @@ services: - REMOTE_CARTESI_MACHINE_LOG_LEVEL=info inspect_server: - image: cartesi/rollups-inspect-server:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-inspect-server restart: always ports: - "5005:5005" @@ -103,7 +104,8 @@ services: SESSION_ID: default_rollups_id indexer: - image: cartesi/rollups-indexer:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-indexer restart: always depends_on: database: @@ -120,7 +122,8 @@ services: - ./deployments:/deployments:ro graphql_server: - image: cartesi/rollups-graphql-server:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-graphql-server ports: - "4000:4000" depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 5c6625cd..ddbfa141 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,7 @@ version: "3.9" x-credentials: &postgres-config - POSTGRES_HOSTNAME: database - POSTGRES_PORT: "5432" - POSTGRES_USER: postgres - POSTGRES_PASSWORD: password - POSTGRES_DB: postgres + POSTGRES_ENDPOINT: postgres://postgres:password@database:5432/postgres services: hardhat: @@ -38,7 +34,8 @@ services: - ./deployments:/app/rollups/deployments dispatcher: - image: cartesi/rollups-dispatcher:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-dispatcher restart: always depends_on: hardhat: @@ -69,7 +66,8 @@ services: - ./deployments:/deployments:ro state_server: - image: cartesi/rollups-state-server:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-state-server restart: always healthcheck: test: ["CMD-SHELL","bash -c 'echo \"\" > /dev/tcp/127.0.0.1/50051;'"] @@ -88,7 +86,8 @@ services: BH_BLOCK_TIMEOUT: 8 advance_runner: - image: cartesi/rollups-advance-runner:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-advance-runner restart: always healthcheck: test: [ "CMD", "curl", "--fail", "localhost:8080/healthz" ] @@ -108,6 +107,7 @@ services: environment: RUST_LOG: info SERVER_MANAGER_ENDPOINT: http://server_manager:5001 + PROVIDER_HTTP_ENDPOINT: http://hardhat:8545 SESSION_ID: default_rollups_id REDIS_ENDPOINT: redis://redis:6379 CHAIN_ID: 31337 @@ -188,7 +188,8 @@ services: ] inspect_server: - image: cartesi/rollups-inspect-server:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-inspect-server restart: always ports: - "5005:5005" @@ -202,7 +203,8 @@ services: SESSION_ID: default_rollups_id indexer: - image: cartesi/rollups-indexer:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-indexer restart: always depends_on: database: @@ -221,7 +223,8 @@ services: - ./deployments:/deployments:ro graphql_server: - image: cartesi/rollups-graphql-server:1.0.0 + image: cartesi/rollups-node:1.1.0 + command: cartesi-rollups-graphql-server ports: - "4000:4000" depends_on: