Update docker configurations to improve environment handling

- Adjust `.dockerignore` to include specific `.env` files instead of generic `.env*`.
- Modify `docker-compose.[production|development].yml` to use optional environment variables for extra parameters.
- Update `.env.sample` with new environment variables and the latest `PGADMIN_VERSION`.
- Refactor `docker/pgadmin/servers.json` to simplify server naming and grouping.

.dockerignore

@@ -14,7 +14,10 @@ src/types
 project.yaml
 
 # dotenv files
-.env*
+.env.sample
+.env.development
+.env.production
+.env.test
 
 # not needed
 docs

.env.sample

@@ -10,7 +10,7 @@ POSTGRES_DB=postgres
 # Pgadmin4
 # NOTE: if you modify POSTGRES_USER/PASSWORD/DB then auto-imported server will not match and you need to setup
 # your own with the modified values on the pgadmin website after first login.
-PGADMIN_VERSION=8.8
+PGADMIN_VERSION=8.11
 PGADMIN_DEFAULT_EMAIL=[email protected]
 PGADMIN_DEFAULT_PASSWORD=admin
 PGADMIN_LISTEN_PORT=5050
@@ -27,6 +27,12 @@ CHAIN_ID=poktroll
 # ENDPOINT=http://proxy:26657
 # Testnet
 ENDPOINT=https://testnet-validated-validator-rpc.poktroll.com
+# Check docs to see what else you can set here:
+# Ref: https://academy.subquery.network/indexer/run_publish/references.html#subql-cli
+SUBQUERY_NODE_EXTRA_PARAMS="--unfinalized-blocks=true"
+# Check docs to see what else you can set here:
+# Ref: https://academy.subquery.network/indexer/run_publish/references.html#subql-query
+SUBQUERY_GRAPHQL_EXTRA_PARAMS=
 
 # Subquery Graphql Engine
 SUBQUERY_GRAPHQL_ENGINE_VERSION=latest

docker-compose.development.yml

@@ -74,7 +74,7 @@ services:
       - ./src:/app/src
       - ignore_types:/app/src/types
     command:
-      - --unfinalized-blocks=true
+      - ${SUBQUERY_NODE_EXTRA_PARAMS:-}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"]
       interval: 3s
@@ -101,9 +101,10 @@ services:
       DB_PASS: ${POSTGRES_PASSWORD}
       DB_DATABASE: ${POSTGRES_DB}
     command:
+      - ${SUBQUERY_GRAPHQL_EXTRA_PARAMS:-}
       - --name=${DB_SCHEMA}
-      - --playground
       - --indexer=http://subquery-node:3000
+      - --playground
     networks:
       - pocketdex
 

docker-compose.production.yml

@@ -67,7 +67,7 @@ services:
       ENDPOINT: ${ENDPOINT}
       CHAIN_ID: ${CHAIN_ID}
     command:
-      - --unfinalized-blocks=true
+      - ${SUBQUERY_NODE_EXTRA_PARAMS:-}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://subquery-node:3000/ready"]
       interval: 3s
@@ -94,9 +94,10 @@ services:
       DB_HOST: postgres
       DB_PORT: 5432
     command:
+      - ${SUBQUERY_GRAPHQL_EXTRA_PARAMS:-}
       - --name=${DB_SCHEMA}
-      - --playground
       - --indexer=http://subquery-node:3000
+      - --playground
     networks:
       - pocketdex
 

docker/pgadmin/servers.json

@@ -1,8 +1,8 @@
 {
-  "DefaultServers": {
+  "Servers": {
     "1": {
-      "Name": "[email protected]",
-      "Group": "Localnet",
+      "Name": "pocketdex",
+      "Group": "Servers",
       "Host": "postgres",
       "Port": 5432,
       "MaintenanceDB": "postgres",