From ee37dc79a7cf83cdd9674fe3a58a7bd7c6fad1bc Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Sun, 17 Mar 2024 22:02:05 +0100 Subject: [PATCH] Fixing the CI Moving the dev test and build to port 5442 from 5432 to avoid conflicting with the running postgresql --- backend/compose.yaml | 2 +- backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java | 2 +- .../ovh/herisson/Clyde/Endpoints/StorageControllerTest.java | 2 +- .../java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/compose.yaml b/backend/compose.yaml index 5257bdf..7076bad 100644 --- a/backend/compose.yaml +++ b/backend/compose.yaml @@ -6,4 +6,4 @@ services: - 'POSTGRES_USER=devel' - 'POSTGRES_PASSWORD=devel' ports: - - '5432:5432' + - '5442:5432' diff --git a/backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java b/backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java index 6df0b74..801e549 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java +++ b/backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java @@ -17,7 +17,7 @@ public class JdbcConfig { public DataSource psqlSource(){ DriverManagerDataSource source = new DriverManagerDataSource(); source.setDriverClassName("org.postgresql.Driver"); - source.setUrl("jdbc:postgresql://localhost:5432/clyde"); + source.setUrl("jdbc:postgresql://localhost:5442/clyde"); source.setUsername("devel"); source.setPassword("devel"); diff --git a/backend/src/test/java/ovh/herisson/Clyde/Endpoints/StorageControllerTest.java b/backend/src/test/java/ovh/herisson/Clyde/Endpoints/StorageControllerTest.java index c9aa264..693d0fa 100644 --- a/backend/src/test/java/ovh/herisson/Clyde/Endpoints/StorageControllerTest.java +++ b/backend/src/test/java/ovh/herisson/Clyde/Endpoints/StorageControllerTest.java @@ -53,7 +53,7 @@ public class StorageControllerTest { .withDatabaseName("clyde") .withUsername("devel") .withPassword("devel") - .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5432), new ExposedPort(5432))))); + .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5442), new ExposedPort(5432))))); @BeforeAll static void beforeAll(){ diff --git a/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java b/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java index 96ddcc9..e831be4 100644 --- a/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java +++ b/backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java @@ -55,7 +55,7 @@ public class UserControllerTest { .withDatabaseName("clyde") .withUsername("devel") .withPassword("devel") - .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5432), new ExposedPort(5432))))); + .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig(new HostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(5442), new ExposedPort(5432))))); @BeforeAll static void beforeAll(){