diff --git a/stack_orchestrator/data/compose/docker-compose-fixturenet-urbit.yml b/stack_orchestrator/data/compose/docker-compose-fixturenet-urbit.yml index afc5672e..bc64cd90 100644 --- a/stack_orchestrator/data/compose/docker-compose-fixturenet-urbit.yml +++ b/stack_orchestrator/data/compose/docker-compose-fixturenet-urbit.yml @@ -14,8 +14,8 @@ services: CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG} CERC_URBIT_APP: ${CERC_URBIT_APP} CERC_ENABLE_APP_INSTALL: ${CERC_ENABLE_APP_INSTALL:-true} - CERC_IPFS_GLOB_HOST_ENDPOINT: ${CERC_IPFS_GLOB_HOST_ENDPOINT:-http://ipfs-glob-host:5001} - CERC_IPFS_SERVER_ENDPOINT: ${CERC_IPFS_SERVER_ENDPOINT:-http://ipfs-glob-host:8080} + CERC_IPFS_GLOB_HOST_ENDPOINT: ${CERC_IPFS_GLOB_HOST_ENDPOINT:-http://ipfs:5001} + CERC_IPFS_SERVER_ENDPOINT: ${CERC_IPFS_SERVER_ENDPOINT:-http://ipfs:8080} entrypoint: ["bash", "-c", "./run-urbit-ship.sh && ./deploy-app.sh && tail -f /dev/null"] volumes: - urbit_data:/urbit @@ -31,24 +31,6 @@ services: retries: 15 start_period: 10s - # TODO: Refactor this outside - ipfs-glob-host: - image: ipfs/kubo:master-2023-02-20-714a968 - volumes: - - ipfs-import:/import - - ipfs-data:/data/ipfs - ports: - - "8080" - - "5001" - healthcheck: - test: ["CMD", "nc", "-v", "localhost", "5001"] - interval: 20s - timeout: 5s - retries: 15 - start_period: 10s - volumes: urbit_data: urbit_app_builds: - ipfs-import: - ipfs-data: diff --git a/stack_orchestrator/data/compose/docker-compose-kubo.yml b/stack_orchestrator/data/compose/docker-compose-kubo.yml index f5f8b06e..2e4ae419 100644 --- a/stack_orchestrator/data/compose/docker-compose-kubo.yml +++ b/stack_orchestrator/data/compose/docker-compose-kubo.yml @@ -1,13 +1,24 @@ version: "3.2" + # See: https://docs.ipfs.tech/install/run-ipfs-inside-docker/#set-up services: ipfs: image: ipfs/kubo:master-2023-02-20-714a968 restart: always volumes: - - ./ipfs/import:/import - - ./ipfs/data:/data/ipfs + - ipfs-import:/import + - ipfs-data:/data/ipfs ports: - - "0.0.0.0:8080:8080" - - "0.0.0.0:4001:4001" + - "4001" + - "8080" - "0.0.0.0:5001:5001" + healthcheck: + test: ["CMD", "nc", "-v", "localhost", "5001"] + interval: 20s + timeout: 5s + retries: 15 + start_period: 10s + +volumes: + ipfs-import: + ipfs-data: diff --git a/stack_orchestrator/data/stacks/uniswap-urbit-app/README.md b/stack_orchestrator/data/stacks/uniswap-urbit-app/README.md index c9727ef3..6818dd94 100644 --- a/stack_orchestrator/data/stacks/uniswap-urbit-app/README.md +++ b/stack_orchestrator/data/stacks/uniswap-urbit-app/README.md @@ -33,7 +33,7 @@ laconic-so --stack uniswap-urbit-app deploy init --output uniswap-urbit-app-spec ### Ports -Edit `network` in spec file to map container ports to same ports in host +Edit `network` in spec file to map container ports to same ports in host: ``` ... @@ -43,12 +43,14 @@ network: - '8080:80' proxy-server: - '4000:4000' - ipfs-glob-host: + ipfs: - '8081:8080' - '5001:5001' ... ``` +Note: Skip the `ipfs` ports if need to use an externally running IPFS node + ### Data volumes Container data volumes are bind-mounted to specified paths in the host filesystem. @@ -104,11 +106,11 @@ Inside the deployment directory, open the file `config.env` and set the followin # IPFS configuration # IFPS endpoint to host the glob file on - # (Default: http://ipfs-glob-host:5001 pointing to in-stack IPFS node) + # (Default: http://ipfs:5001 pointing to in-stack IPFS node) CERC_IPFS_GLOB_HOST_ENDPOINT= # IFPS endpoint to fetch the glob file from - # (Default: http://ipfs-glob-host:8080 pointing to in-stack IPFS node) + # (Default: http://ipfs:8080 pointing to in-stack IPFS node) CERC_IPFS_SERVER_ENDPOINT= ``` diff --git a/stack_orchestrator/data/stacks/uniswap-urbit-app/stack.yml b/stack_orchestrator/data/stacks/uniswap-urbit-app/stack.yml index 8056624f..31499406 100644 --- a/stack_orchestrator/data/stacks/uniswap-urbit-app/stack.yml +++ b/stack_orchestrator/data/stacks/uniswap-urbit-app/stack.yml @@ -11,3 +11,4 @@ pods: - uniswap-interface - proxy-server - fixturenet-urbit + - kubo