Skip to content

Commit cb705c0

Browse files
committed
Update port values
1 parent df09e77 commit cb705c0

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

docker-compose.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#version: "3.8"
1+
version: '3.8'
22
# TODO Read following docs:
33
# https://github.com/docker-library/docs/blob/master/postgres/README.md
44
# https://github.com/docker-library/docs/tree/master/openjdk
@@ -24,7 +24,7 @@ services:
2424
networks:
2525
- app_db_net
2626
ports:
27-
- "5440:5432"
27+
- "5432:5432"
2828

2929
app:
3030
#image: openjdk:8
@@ -37,14 +37,10 @@ services:
3737
- "8080:8080"
3838
volumes:
3939
- ./build/libs:/app
40-
# TODO: modify `command` statement in order to execute
41-
# command: wait-for-it.sh localhost:5432 -t 20 && java -jar /app/todo-app-0.1.jar
42-
# command: 127.0.0.1:5440 -t 20 && java -jar /app/todo-app-0.1.jar
4340
networks:
4441
- app_db_net
45-
# entrypoint:
4642
environment:
47-
- SPRING_DATASOURCE_URL=jdbc:postgresql://postgres_db:5440/todo_db
43+
- SPRING_DATASOURCE_URL=jdbc:postgresql://postgres_db:5432/todo_db
4844
- SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
4945
- SPRING_DATASOURCE_USERNAME=postgres
5046
- SPRING_DATASOURCE_PASSWORD=postgres
@@ -55,7 +51,7 @@ services:
5551
networks:
5652
app_db_net:
5753
driver: bridge
58-
# external: true
54+
external: true
5955
# name: project
6056

6157
volumes:

src/main/resources/application.properties

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ management.endpoints.web.exposure.include=health,info,shutdown
33
#logging.level.root=debug
44

55
# setting up Postgres DB
6-
spring.datasource.url=jdbc:postgresql://postgres_db:5440/todo_db
6+
spring.datasource.url=jdbc:postgresql://postgres_db:5432/todo_db
77
spring.datasource.username=postgres
88
spring.datasource.password=postgres
99
spring.datasource.driverClassName=org.postgresql.Driver
1010

1111
spring.flyway.enabled=true
12-
spring.flyway.url=jdbc:postgresql://postgres_db:5440/todo_db
12+
spring.flyway.url=jdbc:postgresql://postgres_db:5432/todo_db
1313
spring.flyway.driver-class-name=org.postgresql.Driver
1414
spring.flyway.schemas=public
1515
#spring.flyway.baseline-version=1
16-
spring.flyway.baseline-on-migrate=false
16+
#spring.flyway.baseline-on-migrate=false
17+
spring.flyway.baseline-on-migrate=true
1718
spring.flyway.sql-migration-prefix=V
1819
spring.flyway.repeatable-sql-migration-prefix=R
1920
spring.flyway.sql-migration-separator=__

0 commit comments

Comments
 (0)