Skip to content

Commit 87b41d3

Browse files
committed
Merge branch 'Carlos'
2 parents 681b9b7 + 5b5c5fb commit 87b41d3

24 files changed

+808
-223
lines changed

backend/gamelink/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spring.mustache.suffix=.html
1010

1111
spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
1212
spring.datasource.username=postgres
13-
spring.datasource.password=Juanluis-123
13+
spring.datasource.password=password
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

1616
logging.level.org.springframework.security=DEBUG

backend/gamelink/target/classes/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spring.mustache.suffix=.html
1010

1111
spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
1212
spring.datasource.username=postgres
13-
spring.datasource.password=Juanluis-123
13+
spring.datasource.password=password
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

1616
logging.level.org.springframework.security=DEBUG

docker/Docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
environment:
88
- SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/gamelink
99
- SPRING_DATASOURCE_USERNAME=postgres
10-
- SPRING_DATASOURCE_PASSWORD=password
10+
- SPRING_DATASOURCE_PASSWORD=123456
1111
- SPRING_JPA_HIBERNATE_DLL_AUTO=update
1212
- SPRING_JPA_SHOW_SQL=true
1313
restart: on-failure
@@ -19,7 +19,7 @@ services:
1919
restart: always
2020
environment:
2121
- POSTGRES_USER=postgres
22-
- POSTGRES_PASSWORD=Juanluis-123
22+
- POSTGRES_PASSWORD=123456
2323
- POSTGRES_DB=gamelink
2424
volumes:
2525
- ./postgres:/var/lib/postgres

docker/docker-compose.yml~ee5419ba20496b26bc6f469daa6c3f4ca01e5a8b

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.9"
22
services:
33
web:
4-
image: juanurjc/gamelink:latest
4+
image: gamelink_web:latest
55
ports:
66
- 8443:8443
77
environment:
@@ -19,7 +19,7 @@ services:
1919
restart: always
2020
environment:
2121
- POSTGRES_USER=postgres
22-
- POSTGRES_PASSWORD=password
22+
- POSTGRES_PASSWORD=123456
2323
- POSTGRES_DB=gamelink
2424
volumes:
2525
- ./postgres:/var/lib/postgres

0 commit comments

Comments
 (0)