Maxime/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

Fixing the CI

Browse Source 
Moving the dev test and build to port 5442 from 5432 to avoid
conflicting with the running postgresql
This commit is contained in:
Debucquoy Anthony 2024-03-17 22:02:05 +01:00
parent f2b80ba89f
commit ee37dc79a7
Signed by untrusted user: tonitch
GPG Key ID: A78D6421F083D42E
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/compose.yaml
View File

@ -6,4 +6,4 @@ services:
- 'POSTGRES_USER=devel' - 'POSTGRES_USER=devel'
- 'POSTGRES_PASSWORD=devel' - 'POSTGRES_PASSWORD=devel'
ports: ports:
- '5432:5432' - '5442:5432'

2
backend/src/main/java/ovh/herisson/Clyde/JdbcConfig.java
View File

@ -17,7 +17,7 @@ public class JdbcConfig {
public DataSource psqlSource(){ public DataSource psqlSource(){
DriverManagerDataSource source = new DriverManagerDataSource(); DriverManagerDataSource source = new DriverManagerDataSource();
source.setDriverClassName("org.postgresql.Driver"); source.setDriverClassName("org.postgresql.Driver");
source.setUrl("jdbc:postgresql://localhost:5432/clyde"); source.setUrl("jdbc:postgresql://localhost:5442/clyde");
source.setUsername("devel"); source.setUsername("devel");
source.setPassword("devel"); source.setPassword("devel");

2
backend/src/test/java/ovh/herisson/Clyde/Endpoints/StorageControllerTest.java
View File

@ -53,7 +53,7 @@ public class StorageControllerTest {
.withDatabaseName("clyde") .withDatabaseName("clyde")
.withUsername("devel") .withUsername("devel")
.withPassword("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 @BeforeAll
static void beforeAll(){ static void beforeAll(){

2
backend/src/test/java/ovh/herisson/Clyde/Endpoints/UserControllerTest.java
View File

@ -55,7 +55,7 @@ public class UserControllerTest {
.withDatabaseName("clyde") .withDatabaseName("clyde")
.withUsername("devel") .withUsername("devel")
.withPassword("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 @BeforeAll
static void beforeAll(){ static void beforeAll(){