chore: more docker improvements (#2004)

sevenzing · web-flow · commit a51990a5bb30 · 2026-04-29T21:13:40.000+04:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
           commit: "chore(release): version apps"
           title: "Release New Version"
           version: pnpm changeset:version
-          publish: pnpm changeset-publish
+          publish: pnpm changeset:publish
           createGithubReleases: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release_snapshot.yml b/.github/workflows/release_snapshot.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: Publish snapshot packages to NPM
         if: steps.snapshot.outputs.hasChanges == 'true'
-        run: pnpm changeset-publish:next
+        run: pnpm changeset:publish:next
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/apps/ensapi/package.json b/apps/ensapi/package.json
@@ -18,7 +18,8 @@
     "lint": "biome check --write .",
     "lint:ci": "biome ci",
     "typecheck": "tsgo --noEmit",
-    "generate:gqlschema": "tsx src/omnigraph-api/lib/write-graphql-schema.ts"
+    "generate:gqlschema": "tsx src/omnigraph-api/lib/write-graphql-schema.ts",
+    "version:current": "node -p \"require('./package.json').version\""
   },
   "dependencies": {
     "@ensdomains/ensjs": "^4.0.2",
diff --git a/docker/README.md b/docker/README.md
@@ -6,11 +6,11 @@ All commands are run from the **monorepo root**.
 
 | File                                     | Purpose                                                                                |
 | ---------------------------------------- | -------------------------------------------------------------------------------------- |
-| `docker/docker-compose.yml`              | Base stack — ensindexer, ensapi, ensrainbow, ensadmin, postgres. For mainnet/sepolia.  |
+| `docker/docker-compose.yml`              | Base stack — ensindexer, ensapi, ensrainbow, ensadmin, ensdb. For mainnet/sepolia.     |
 | `docker/docker-compose.devnet.yml`       | Full stack against local devnet (`ens-test-env`). Includes all base services + devnet. |
-| `docker/docker-compose.orchestrator.yml` | Minimal infra for CI — devnet + postgres only. Used by `orchestrator.ts`.              |
+| `docker/docker-compose.orchestrator.yml` | Minimal infra for CI — devnet + ensdb only. Used by `orchestrator.ts`.                 |
 | `docker/services/*.yml`                  | Individual service definitions. Extended by the compose files above.                   |
-| `docker/envs/.env.docker.common`         | Shared env defaults (postgres credentials, internal service URLs). Committed.          |
+| `docker/envs/.env.docker.common`         | Shared env defaults (ensdb credentials, internal service URLs). Committed.             |
 | `docker/envs/.env.docker.devnet`         | Devnet defaults (PLUGINS, etc.). Committed. Works out of the box.                      |
 | `docker/envs/.env.docker.example`        | Example for user-specific config. Copy to `.env.docker.local` for mainnet/sepolia.     |
 | `docker/envs/.env.docker.local`          | User config (gitignored). Required for base stack, optional for devnet overrides.      |
@@ -57,7 +57,7 @@ To override defaults (e.g. change `PLUGINS`), create `docker/envs/.env.docker.lo
 docker compose -f docker/docker-compose.devnet.yml up -d
 
 # Start only devnet + core services (no ensadmin)
-docker compose -f docker/docker-compose.devnet.yml up -d devnet postgres ensrainbow ensindexer ensapi
+docker compose -f docker/docker-compose.devnet.yml up -d ensindexer ensapi
 
 # Start only devnet (quick local EVM node, also shows data information about devnet)
 docker compose -f docker/docker-compose.devnet.yml up devnet
@@ -83,7 +83,7 @@ pnpm docker:build:ensadmin
 
 ### CI / integration tests
 
-Used internally by `orchestrator.ts` via testcontainers. Starts devnet + postgres only.
+Used internally by `orchestrator.ts` via testcontainers. Starts devnet + ensdb only.
 
 ```bash
 pnpm test:integration:ci
diff --git a/docker/docker-compose.devnet.yml b/docker/docker-compose.devnet.yml
@@ -4,12 +4,6 @@ services:
       file: services/ensindexer.yml
       service: ensindexer
     environment:
-      # TODO: in future we will migrate devnet to chain_id=1
-      # need to remove `RPC_URL_15658733` in that case
-      RPC_URL_15658733: http://devnet:8545
-      RPC_URL_1: http://devnet:8545
-      ENSINDEXER_SCHEMA_NAME: docker_devnet_v1
-      LABEL_SET_ID: ens-test-env
       NAMESPACE: ens-test-env
     env_file:
       - path: envs/.env.docker.common
@@ -21,7 +15,7 @@ services:
     depends_on:
       ensrainbow:
         condition: service_healthy
-      postgres:
+      ensdb:
         condition: service_healthy
       devnet:
         condition: service_healthy
@@ -30,14 +24,8 @@ services:
     extends:
       file: services/ensapi.yml
       service: ensapi
-    environment:
-      # TODO: in future we will migrate devnet to chain_id=1
-      # need to remove `RPC_URL_15658733` in that case
-      RPC_URL_15658733: http://devnet:8545
-      RPC_URL_1: http://devnet:8545
-      ENSINDEXER_SCHEMA_NAME: docker_devnet_v1
     depends_on:
-      postgres:
+      ensdb:
         condition: service_healthy
     env_file:
       - path: envs/.env.docker.common
@@ -51,8 +39,6 @@ services:
     extends:
       file: services/ensrainbow.yml
       service: ensrainbow
-    environment:
-      LABEL_SET_ID: ens-test-env
     env_file:
       - path: envs/.env.docker.common
         required: true
@@ -76,12 +62,12 @@ services:
       - path: envs/.env.docker.local
         required: false
 
-  postgres:
+  ensdb:
     extends:
-      file: services/postgres.yml
-      service: postgres
+      file: services/ensdb.yml
+      service: ensdb
     env_file:
-      - path: ./envs/.env.docker.common
+      - path: envs/.env.docker.common
         required: true
 
   devnet:
@@ -94,8 +80,8 @@ volumes:
   # compose file that references them — they cannot be inherited via `extends`.
   # Explicit `name:` prevents collision with the base stack's volumes when both
   # are run from the same directory (same project name).
-  postgres_data:
-    name: ensnode_devnet_postgres_data
+  ensdb_data:
+    name: ensnode_devnet_ensdb_data
     driver: local
   ensrainbow_data:
     name: ensnode_devnet_ensrainbow_data
diff --git a/docker/docker-compose.orchestrator.yml b/docker/docker-compose.orchestrator.yml
@@ -1,22 +1,22 @@
 # Minimal compose for CI integration tests.
 # Provides only the infrastructure services needed by orchestrator.ts:
-# devnet (local EVM) and postgres (database).
+# devnet (local EVM) and ensdb (database).
 services:
   devnet:
     extends:
       file: services/devnet.yml
       service: devnet
 
-  postgres:
+  ensdb:
     extends:
-      file: services/postgres.yml
-      service: postgres
+      file: services/ensdb.yml
+      service: ensdb
     env_file:
-      - path: ./envs/.env.docker.common
+      - path: envs/.env.docker.common
         required: true
 
 volumes:
   # Docker Compose requires volumes used by services to be declared in each
   # compose file that references them — they cannot be inherited via `extends`.
-  postgres_data:
+  ensdb_data:
     driver: local
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -3,12 +3,13 @@ services:
     extends:
       file: services/ensindexer.yml
       service: ensindexer
+    restart: unless-stopped
     environment:
       ENSINDEXER_SCHEMA_NAME: docker_ensindexer_v1
     depends_on:
       ensrainbow:
         condition: service_healthy
-      postgres:
+      ensdb:
         condition: service_healthy
     env_file:
       - path: envs/.env.docker.common
@@ -21,10 +22,11 @@ services:
     extends:
       file: services/ensapi.yml
       service: ensapi
+    restart: unless-stopped
     environment:
       ENSINDEXER_SCHEMA_NAME: docker_ensindexer_v1
     depends_on:
-      postgres:
+      ensdb:
         condition: service_healthy
     env_file:
       - path: envs/.env.docker.common
@@ -36,6 +38,7 @@ services:
     extends:
       file: services/ensrainbow.yml
       service: ensrainbow
+    restart: unless-stopped
     env_file:
       - path: envs/.env.docker.common
         required: true
@@ -46,6 +49,7 @@ services:
     extends:
       file: services/ensadmin.yml
       service: ensadmin
+    restart: unless-stopped
     depends_on:
       ensapi:
         condition: service_started
@@ -55,18 +59,19 @@ services:
       - path: envs/.env.docker.local
         required: true
 
-  postgres:
+  ensdb:
     extends:
-      file: services/postgres.yml
-      service: postgres
+      file: services/ensdb.yml
+      service: ensdb
+    restart: unless-stopped
     env_file:
       - path: envs/.env.docker.common
         required: true
 
 volumes:
   # Docker Compose requires volumes used by services to be declared in each
   # compose file that references them — they cannot be inherited via `extends`.
-  postgres_data:
+  ensdb_data:
     driver: local
   ensrainbow_data:
     driver: local
diff --git a/docker/envs/.env.docker.common b/docker/envs/.env.docker.common
@@ -1,16 +1,15 @@
 # Shared Docker Compose environment variables
 # Used by docker/docker-compose.yml and its variants
 
-
 # Postgres
 POSTGRES_DB=postgres
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=password
 
 # Internal service URLs (container-to-container)
-ENSDB_URL=postgresql://postgres:password@postgres:5432/postgres
+ENSDB_URL=postgresql://postgres:password@ensdb:5432/postgres
 ENSRAINBOW_URL=http://ensrainbow:3223
 
-# ENS Admin
+# ENSAdmin
 ENSADMIN_PUBLIC_URL=http://localhost:4173
 NEXT_PUBLIC_SERVER_CONNECTION_LIBRARY=http://localhost:4334
diff --git a/docker/envs/.env.docker.devnet b/docker/envs/.env.docker.devnet
@@ -1,6 +1,18 @@
 # Default configuration for devnet docker-compose stack.
 # These values work out of the box — override by creating .env.docker.local.
 
+# ENSIndexer
 PLUGINS=subgraph,ensv2
+# ENSIndexer and ENSApi
+ENSINDEXER_SCHEMA_NAME=docker_devnet_v1
+# ENSIndexer and ENSApi
+RPC_URL_1=http://devnet:8545
+# ENSIndexer and ENSRainbow
 LABEL_SET_VERSION=0
+# ENSIndexer and ENSRainbow
+LABEL_SET_ID=ens-test-env
+# ENSRainbow
 DB_SCHEMA_VERSION=3
+# TODO: in future we might migrate devnet to different chain_id like 1337 or 31337
+# need to update this `RPC_URL_15658733` in that case
+RPC_URL_15658733=http://devnet:8545
diff --git a/docker/services/ensadmin.yml b/docker/services/ensadmin.yml
@@ -1,7 +1,7 @@
 services:
   ensadmin:
     container_name: ensadmin
-    image: ghcr.io/namehash/ensnode/ensadmin:latest
+    image: ghcr.io/namehash/ensnode/ensadmin:${ENSNODE_VERSION:-1.10.1}
     build:
       dockerfile: ./apps/ensadmin/Dockerfile
       context: ../..
diff --git a/docker/services/ensapi.yml b/docker/services/ensapi.yml
@@ -1,7 +1,7 @@
 services:
   ensapi:
     container_name: ensapi
-    image: ghcr.io/namehash/ensnode/ensapi:latest
+    image: ghcr.io/namehash/ensnode/ensapi:${ENSNODE_VERSION:-1.10.1}
     build:
       dockerfile: ./apps/ensapi/Dockerfile
       context: ../..
diff --git a/docker/services/ensdb.yml b/docker/services/ensdb.yml
@@ -1,11 +1,11 @@
 services:
-  postgres:
-    container_name: postgres
+  ensdb:
+    container_name: ensdb
     image: postgres:17
     ports:
       - "5432:5432"
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - ensdb_data:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
diff --git a/docker/services/ensindexer.yml b/docker/services/ensindexer.yml
@@ -1,7 +1,7 @@
 services:
   ensindexer:
     container_name: ensindexer
-    image: ghcr.io/namehash/ensnode/ensindexer:latest
+    image: ghcr.io/namehash/ensnode/ensindexer:${ENSNODE_VERSION:-1.10.1}
     build:
       dockerfile: ./apps/ensindexer/Dockerfile
       context: ../..
diff --git a/docker/services/ensrainbow.yml b/docker/services/ensrainbow.yml
@@ -1,15 +1,14 @@
 services:
   ensrainbow:
     container_name: ensrainbow
-    image: ghcr.io/namehash/ensnode/ensrainbow:latest
+    image: ghcr.io/namehash/ensnode/ensrainbow:${ENSNODE_VERSION:-1.10.1}
     build:
       dockerfile: ./apps/ensrainbow/Dockerfile
       context: ../..
     ports:
       - "3223:3223"
     volumes:
       - ensrainbow_data:/app/apps/ensrainbow/data
-    restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-q", "--spider", "http://localhost:3223/health"]
       interval: 30s
diff --git a/docs/ensnode.io/src/content/docs/docs/deploying/docker.mdx b/docs/ensnode.io/src/content/docs/docs/deploying/docker.mdx
@@ -20,7 +20,7 @@ ENSIndexer runs `CREATE EXTENSION IF NOT EXISTS pg_trgm` at startup to back part
 
 ENSNode provides several [Docker Compose](https://docs.docker.com/compose/) files for different use cases:
 
-- **`docker/docker-compose.yml`** — base stack for mainnet/sepolia: ensindexer, ensapi, ensrainbow, ensadmin, postgres
+- **`docker/docker-compose.yml`** — base stack for mainnet/sepolia: ensindexer, ensapi, ensrainbow, ensadmin, ensdb (postgres)
 - **`docker/docker-compose.devnet.yml`** — full stack against local devnet (ens-test-env), works out of the box with no configuration required
 
 ### Mainnet / Sepolia
diff --git a/package.json b/package.json
@@ -12,13 +12,15 @@
     "audit:osv": "osv-scanner scan source --lockfile pnpm-lock.yaml",
     "typecheck": "pnpm -r --parallel --aggregate-output typecheck",
     "changeset": "changeset",
-    "changeset:version": "changeset version && pnpm generate:openapi",
-    "changeset:next": "changeset version --snapshot next && pnpm generate:openapi",
-    "changeset-publish": "changeset publish",
-    "changeset-publish:next": "changeset publish --no-git-tag --snapshot --tag next",
+    "changeset:version": "changeset version && pnpm release:postversion",
+    "changeset:next": "changeset version --snapshot next && pnpm release:postversion",
+    "changeset:publish": "changeset publish",
+    "changeset:publish:next": "changeset publish --no-git-tag --snapshot --tag next",
+    "release:postversion": "pnpm docker:version:sync && pnpm generate:openapi",
     "packages:prepublish": "pnpm -r prepublish",
     "devnet": "docker compose -f docker/docker-compose.devnet.yml up devnet",
     "docker:build:ensnode": "pnpm run -w --parallel \"/^docker:build:.*/\"",
+    "docker:version:sync": "node ./scripts/sync-docker-services-tags.mjs \"$(pnpm -F ensapi -s version:current)\"",
     "docker:build:ensindexer": "docker build -f apps/ensindexer/Dockerfile -t ghcr.io/namehash/ensnode/ensindexer:latest .",
     "docker:build:ensadmin": "docker build -f apps/ensadmin/Dockerfile -t ghcr.io/namehash/ensnode/ensadmin:latest .",
     "docker:build:ensrainbow": "docker build -f apps/ensrainbow/Dockerfile -t ghcr.io/namehash/ensnode/ensrainbow:latest .",
diff --git a/packages/integration-test-env/src/orchestrator.ts b/packages/integration-test-env/src/orchestrator.ts
diff --git a/scripts/sync-docker-services-tags.mjs b/scripts/sync-docker-services-tags.mjs
