From 09eae1424e35edf6d0a1287ade5fdab57d3c1a2e Mon Sep 17 00:00:00 2001 From: leo <leopold@lchappuis.fr> Date: Wed, 15 Jan 2025 21:38:21 -0500 Subject: [PATCH] misc: update dev port port 5000 is usually already used by osx Change-Id: I21fa463de2abcd9878777a597c81537e63cd962c --- README.md | 2 +- client/.env.development | 2 +- client/cypress.env.example.json | 2 +- docker-compose.dev.yml | 2 +- server/src/index.ts | 2 +- server/src/routers/admin-router.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 96ff090a..33a307ca 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,7 @@ The application is now `running on port 3000` of your local machine. ``` docker run -it \ -p 3000:3000 \ - -p 5000:5000 \ + -p 5002:5002 \ --volume ${PWD}/client/src:/web-client/client/src \ --volume ${PWD}/server/src:/web-client/server/src \ --volume ${PWD}/client/.env.development:/web-client/client/.env.development \ diff --git a/client/.env.development b/client/.env.development index 6d453cd5..d3a49b70 100644 --- a/client/.env.development +++ b/client/.env.development @@ -1,2 +1,2 @@ ESLINT_NO_DEV_ERRORS=true -VITE_API_URL=http://localhost:5000 \ No newline at end of file +VITE_API_URL=http://localhost:5002 \ No newline at end of file diff --git a/client/cypress.env.example.json b/client/cypress.env.example.json index f6bea189..447bbb94 100644 --- a/client/cypress.env.example.json +++ b/client/cypress.env.example.json @@ -1,6 +1,6 @@ { "CLIENT_URL": "http://localhost:3000", - "SERVER_URL": "http://localhost:5000", + "SERVER_URL": "http://localhost:5002", "TEST_USERNAME": "your-test-user", "TEST_USER_PASSWORD": "your-test-password", "USED_USERNAME": "your-used-username" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a9006801..1fbe52b1 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -14,7 +14,7 @@ services: - ./client/.env.development:/web-client/client/.env.development ports: - '3000:3000' - - '5000:5000' + - '5002:5002' stdin_open: true depends_on: - jami-daemon diff --git a/server/src/index.ts b/server/src/index.ts index 6c93e8b6..565ee586 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -35,7 +35,7 @@ const isDev = process.env.NODE_ENV === 'development' ? true : false log.setLevel(isDev ? 'trace' : 'error') -const port: string | number = isDev ? 5000 : 8080 +const port: string | number = isDev ? 5002 : 8080 await Container.get(SigningKeys).build() const jamid = Container.get(Jamid) diff --git a/server/src/routers/admin-router.ts b/server/src/routers/admin-router.ts index f7210510..aaed0f37 100644 --- a/server/src/routers/admin-router.ts +++ b/server/src/routers/admin-router.ts @@ -402,7 +402,7 @@ adminRouter.get( const protocol = req.secure ? 'https' : 'http' const host = req.get('host') - const baseUrl = devMode ? 'http://localhost:5000' : `${protocol}://${host}` + const baseUrl = devMode ? 'http://localhost:5002' : `${protocol}://${host}` if (providerConfig === undefined) { res.status(HttpStatusCode.InternalServerError).send('Provider configuration not found') -- GitLab