diff --git a/README.md b/README.md index 1667e7d..72d0326 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ Your environment now contains: - [terrad](http://github.com/terra-money/core) RPC node running on `tcp://localhost:26657` - LCD running on http://localhost:1317 -- [FCD](http://www.github.com/terra-money/fcd) running on http://localhost:3060 -- An oracle feeder feeding live prices from mainnet, trailing by one vote period +Note: to run localterra with FCD use the docker-compose file from +- [FCD](http://www.github.com/terra-money/fcd) Stop LocalTerra: diff --git a/compose-fcd.yml b/compose-fcd.yml deleted file mode 100644 index 46f2e73..0000000 --- a/compose-fcd.yml +++ /dev/null @@ -1,66 +0,0 @@ -version: "3.8" - -x-fcd-env: &fcd-env - - CHAIN_ID=localterra - - LCD_URI=http://terrad:1317 - - RPC_URI=http://terrad:26657 - - USE_LOG_FILE=true - - TYPEORM_CONNECTION=postgres - - TYPEORM_HOST=postgres - - TYPEORM_USERNAME=terra - - TYPEORM_PASSWORD=abc123 - - TYPEORM_DATABASE=fcd - - TYPEORM_SYNCHRONIZE=true - - TYPEORM_LOGGING=false - - TYPEORM_ENTITIES=src/orm/*Entity.ts - - LEGACY_NETWORK=false - -services: - terrad: - extends: - file: compose-rpc.yml - service: terrad - - postgres: - image: postgres:14-alpine - hostname: postgres - environment: - POSTGRES_USER: terra - POSTGRES_PASSWORD: abc123 - volumes: - - ./initdb.d:/docker-entrypoint-initdb.d - - pgdata:/var/lib/postgresql/data - networks: - - default - ports: - - 5433:5432 - - fcd_collector: - image: ghcr.io/terra-money/fcd:${TERRA_VERSION} - command: collector - hostname: fcd_collector - restart: unless-stopped - environment: *fcd-env - volumes: - - ./logs:/app/logs - networks: - - default - - fcd_api: - image: ghcr.io/terra-money/fcd:${TERRA_VERSION} - command: start - hostname: fcd_api - environment: *fcd-env - volumes: - - ./logs:/app/logs - networks: - - default - ports: - - 3060:3060 - -volumes: - terra: - pgdata: - -networks: - default: diff --git a/compose-rpc.yml b/compose-rpc.yml deleted file mode 100644 index 97df613..0000000 --- a/compose-rpc.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: "3.8" - -services: - terrad: - build: - context: . - dockerfile: Dockerfile - args: - TERRA_VERSION: ${TERRA_VERSION} - image: ghcr.io/terra-money/localterra:${TERRA_VERSION} - hostname: terrad - pull_policy: always - volumes: - - terra:/app - networks: - - default - ports: - - "1317:1317" - - "9090:9090" - - "9091:9091" - - "26657:26657" - -volumes: - terra: - -networks: - default: diff --git a/docker-compose.yml b/docker-compose.yml index f85d79b..97df613 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,27 +1,27 @@ +version: "3.8" + services: terrad: - extends: - file: compose-rpc.yml - service: terrad - - postgres: - extends: - file: compose-fcd.yml - service: postgres - - fcd_collector: - extends: - file: compose-fcd.yml - service: fcd_collector - - fcd_api: - extends: - file: compose-fcd.yml - service: fcd_api + build: + context: . + dockerfile: Dockerfile + args: + TERRA_VERSION: ${TERRA_VERSION} + image: ghcr.io/terra-money/localterra:${TERRA_VERSION} + hostname: terrad + pull_policy: always + volumes: + - terra:/app + networks: + - default + ports: + - "1317:1317" + - "9090:9090" + - "9091:9091" + - "26657:26657" volumes: terra: - pgdata: networks: default: