From 2a93f67c44083e056c460a3c9b812c2da67b56af Mon Sep 17 00:00:00 2001 From: Kamil Kisiela Date: Tue, 31 Jan 2023 00:06:30 +0100 Subject: [PATCH] Fix port's default value in external-composition docker image (#1190) --- .../services/external-composition/federation-2/package.json | 2 +- .../external-composition/federation-2/src/environment.ts | 4 ++-- .../docs/src/pages/features/external-schema-composition.mdx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/services/external-composition/federation-2/package.json b/packages/services/external-composition/federation-2/package.json index 5a13c3890..082f6d4cb 100644 --- a/packages/services/external-composition/federation-2/package.json +++ b/packages/services/external-composition/federation-2/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "build": "bob runify --single", - "dev": "tsup-node src/dev.ts --format esm --shims --target node18 --watch --sourcemap --onSuccess 'node --enable-source-maps dist/dev.js' | pino-pretty --translateTime HH:MM:ss TT --ignore pid,hostname" + "dev": "tsup-node src/index.ts --format esm --shims --target node18 --watch --sourcemap --onSuccess 'node --enable-source-maps dist/index.js' | pino-pretty --translateTime HH:MM:ss TT --ignore pid,hostname" }, "dependencies": { "@apollo/composition": "^2.2.2", diff --git a/packages/services/external-composition/federation-2/src/environment.ts b/packages/services/external-composition/federation-2/src/environment.ts index 1a79c5766..2af39f33a 100644 --- a/packages/services/external-composition/federation-2/src/environment.ts +++ b/packages/services/external-composition/federation-2/src/environment.ts @@ -11,7 +11,7 @@ const BaseSchema = zod.object({ NODE_ENV: zod.string().default('production'), ENVIRONMENT: zod.string().default('production'), RELEASE: zod.string().default(''), - PORT: zod.coerce.number(), + PORT: zod.coerce.number().default(3069), SECRET: zod.string(), }); @@ -40,7 +40,7 @@ export function resolveEnv(env: Record) { environment: base.ENVIRONMENT, release: base.RELEASE ?? 'local', http: { - port: base.PORT ?? 3069, + port: base.PORT, }, secret: base.SECRET, }; diff --git a/packages/web/docs/src/pages/features/external-schema-composition.mdx b/packages/web/docs/src/pages/features/external-schema-composition.mdx index 7dc03037d..90a3c667d 100644 --- a/packages/web/docs/src/pages/features/external-schema-composition.mdx +++ b/packages/web/docs/src/pages/features/external-schema-composition.mdx @@ -260,7 +260,7 @@ will be used as private key to hash the requests to your composition service. To run the container, you can use the following command: ``` -docker run -p 3069 -e SECRET="MY_SECRET_HERE" ghcr.io/kamilkisiela/graphql-hive/composition-federation-2 +docker run -p 3069:3069 -e SECRET="MY_SECRET_HERE" ghcr.io/kamilkisiela/graphql-hive/composition-federation-2 ``` You should make this service publicly available, and then configure it in Hive platform (see