Merge branch 'release/v2.4' into release/v2.2

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:

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: