From 8c4a39e943e42128b79333259f0fc1e0b80c9f58 Mon Sep 17 00:00:00 2001 From: Sebastian Pietras Date: Sat, 19 Oct 2024 21:53:52 +0200 Subject: [PATCH] Changed ports (#4) --- .copier-answers.yaml | 2 +- docker-compose.yaml | 6 +++--- docs/docs/03-Configuration.md | 6 +++--- package.json | 4 ++-- src/api/beaver/client.ts | 2 +- src/api/gecko/client.ts | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index a5a0787..7ad8df3 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -9,7 +9,7 @@ docsurl: https://radio-aktywne.github.io/magnolia envprefix: MAGNOLIA imagename: apps/magnolia keyprefix: magnolia -port: 38000 +port: 10720 registry: true releases: true reponame: magnolia diff --git a/docker-compose.yaml b/docker-compose.yaml index 828e202..a8e2ac5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,13 +5,13 @@ services: network: host environment: - "MAGNOLIA__SERVER__HOST=${MAGNOLIA__SERVER__HOST:-0.0.0.0}" - - "MAGNOLIA__SERVER__PORT=${MAGNOLIA__SERVER__PORT:-38000}" + - "MAGNOLIA__SERVER__PORT=${MAGNOLIA__SERVER__PORT:-10720}" - "MAGNOLIA__BEAVER__HTTP__SCHEME=${MAGNOLIA__BEAVER__HTTP__SCHEME:-http}" - "MAGNOLIA__BEAVER__HTTP__HOST=${MAGNOLIA__BEAVER__HTTP__HOST:-localhost}" - - "MAGNOLIA__BEAVER__HTTP__PORT=${MAGNOLIA__BEAVER__HTTP__PORT:-35000}" + - "MAGNOLIA__BEAVER__HTTP__PORT=${MAGNOLIA__BEAVER__HTTP__PORT:-10500}" - "MAGNOLIA__BEAVER__HTTP__PATH=${MAGNOLIA__BEAVER__HTTP__PATH:-}" - "MAGNOLIA__GECKO__HTTP__SCHEME=${MAGNOLIA__GECKO__HTTP__SCHEME:-http}" - "MAGNOLIA__GECKO__HTTP__HOST=${MAGNOLIA__GECKO__HTTP__HOST:-localhost}" - - "MAGNOLIA__GECKO__HTTP__PORT=${MAGNOLIA__GECKO__HTTP__PORT:-31000}" + - "MAGNOLIA__GECKO__HTTP__PORT=${MAGNOLIA__GECKO__HTTP__PORT:-10700}" - "MAGNOLIA__GECKO__HTTP__PATH=${MAGNOLIA__GECKO__HTTP__PATH:-}" network_mode: host diff --git a/docs/docs/03-Configuration.md b/docs/docs/03-Configuration.md index 0c85118..75c8837 100644 --- a/docs/docs/03-Configuration.md +++ b/docs/docs/03-Configuration.md @@ -12,7 +12,7 @@ You can configure the app at runtime using various environment variables: (default: `0.0.0.0`) - `MAGNOLIA__SERVER__PORT` - port to run the server on - (default: `38000`) + (default: `10720`) - `MAGNOLIA__BEAVER__HTTP__SCHEME` scheme of the HTTP API of the beaver service (default: `http`) @@ -21,7 +21,7 @@ You can configure the app at runtime using various environment variables: (default: `localhost`) - `MAGNOLIA__BEAVER__HTTP__PORT` port of the HTTP API of the beaver service - (default: `35000`) + (default: `10500`) - `MAGNOLIA__BEAVER__HTTP__PATH` path of the HTTP API of the beaver service (default: ``) @@ -33,7 +33,7 @@ You can configure the app at runtime using various environment variables: (default: `localhost`) - `MAGNOLIA__GECKO__HTTP__PORT` port of the HTTP API of the gecko service - (default: `31000`) + (default: `10700`) - `MAGNOLIA__GECKO__HTTP__PATH` path of the HTTP API of the gecko service (default: ``) diff --git a/package.json b/package.json index 36e0694..b10a914 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "magnolia", "private": true, "scripts": { - "dev": "next dev --hostname \"${MAGNOLIA__SERVER__HOST:-0.0.0.0}\" --port \"${MAGNOLIA__SERVER__PORT:-38000}\"", - "run": "next start --hostname \"${MAGNOLIA__SERVER__HOST:-0.0.0.0}\" --port \"${MAGNOLIA__SERVER__PORT:-38000}\"", + "dev": "next dev --hostname \"${MAGNOLIA__SERVER__HOST:-0.0.0.0}\" --port \"${MAGNOLIA__SERVER__PORT:-10720}\"", + "run": "next start --hostname \"${MAGNOLIA__SERVER__HOST:-0.0.0.0}\" --port \"${MAGNOLIA__SERVER__PORT:-10720}\"", "build": "next build", "clean": "rm --recursive --force build/", "update": "ncu --peer --upgrade && npm i --no-audit --no-fund", diff --git a/src/api/beaver/client.ts b/src/api/beaver/client.ts index 73e1025..e0b938d 100644 --- a/src/api/beaver/client.ts +++ b/src/api/beaver/client.ts @@ -7,7 +7,7 @@ const scheme = process.env.MAGNOLIA__BEAVER__HTTP__SCHEME || "http"; const host = process.env.MAGNOLIA__BEAVER__HTTP__HOST || "localhost"; const port = process.env.MAGNOLIA__BEAVER__HTTP__PORT === undefined - ? 35000 + ? 10500 : process.env.MAGNOLIA__BEAVER__HTTP__PORT; const path = (process.env.MAGNOLIA__BEAVER__HTTP__PATH || "") // Ensure path starts with a slash diff --git a/src/api/gecko/client.ts b/src/api/gecko/client.ts index 25ecb07..1a42211 100644 --- a/src/api/gecko/client.ts +++ b/src/api/gecko/client.ts @@ -7,7 +7,7 @@ const scheme = process.env.MAGNOLIA__GECKO__HTTP__SCHEME || "http"; const host = process.env.MAGNOLIA__GECKO__HTTP__HOST || "localhost"; const port = process.env.MAGNOLIA__GECKO__HTTP__PORT === undefined - ? 31000 + ? 10700 : process.env.MAGNOLIA__GECKO__HTTP__PORT; const path = (process.env.MAGNOLIA__GECKO__HTTP__PATH || "") // Ensure path starts with a slash