Make following changes:

- Bump up flyway version
- Modify service names, ports and add network in docker-compose file
- Modify DB params
- Update README file

Author: nixos89

Dockerfile2

@@ -26,5 +26,5 @@ ADD ./wait-for-it.sh wait-for-it.sh
 
 ENTRYPOINT [ "/bin/bash", "-c" ]
 # modify 2nd argumet in next (i.e. `CMD`) line
-CMD ["/wait-for-it.sh" , "[localhost:5432]" , "--strict" , "--timeout=300" , "--" , "java -jar /app/sb-kotlin-java-app-0.1.jar"]
+CMD ["/wait-for-it.sh" , "[localhost:5440]" , "--strict" , "--timeout=300" , "--" , "java -jar /app/sb-kotlin-java-app-0.1.jar"]
 #ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app/sb-kotlin-java-app-0.1.jar"]

README.md

@@ -20,7 +20,7 @@ To properly set up and run the app perform following steps:
 
 ## 2. App containerization
 If you prefer not to have...
-#TODO: Finish this!
+#TODO: Finish this!!!!!!!!!!!!!
 
 
 ## 3. REST Endpoints

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     kotlin("jvm") version "1.5.10"
     id("org.springframework.boot") version "2.5.0"
     id("io.spring.dependency-management") version "1.0.11.RELEASE"
-    id("org.flywaydb.flyway") version "7.9.1"
+    id("org.flywaydb.flyway") version "7.15.0"
     kotlin("plugin.spring") version "1.5.10"
     kotlin("plugin.jpa") version "1.5.10"
     kotlin("plugin.allopen") version "1.5.10"
@@ -51,10 +51,12 @@ dependencies {
     testImplementation("com.ninja-squad:springmockk:3.0.1")
     implementation("org.springframework.boot:spring-boot-starter-mustache")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
-    runtimeOnly("org.postgresql:postgresql")
+//    runtimeOnly("org.postgresql:postgresql")
+    implementation("org.postgresql:postgresql:42.2.24")
     implementation( "org.flywaydb:flyway-core:7.9.1")
     kapt("org.springframework.boot:spring-boot-configuration-processor")
     implementation("org.springframework.boot:spring-boot-configuration-processor")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 }
 
 tasks.withType<KotlinCompile> {

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+#version: "3.8"
 # TODO Read following docs:
 # https://github.com/docker-library/docs/blob/master/postgres/README.md
 # https://github.com/docker-library/docs/tree/master/openjdk
@@ -9,38 +9,54 @@ version: "3.7"
 # ****************************************************************************************************************
 
 services:
-  postgres-db:
+  postgres_db:
     image: postgres:12.9
-    container_name: postgres-db
+    restart: always
+    container_name: postgres_db
     volumes:
       - postgres-data:/var/lib/postgresql/data
+#      - postgres-data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: todo_db
       # TODO: try mapping to different host and container ports
+    networks:
+      - app_db_net
     ports:
       - "5440:5432"
-      - "5441:5440"
 
   app:
-    image: openjdk:8
+    #image: openjdk:8
+    build: .
+    image: nixos89/todo_app:0.2
+    container_name: todo_app
     depends_on:
-      - postgres-db
+      - postgres_db
     ports:
       - "8080:8080"
     volumes:
       - ./build/libs:/app
     # TODO: modify `command` statement in order to execute
-    command: wait-for-it.sh localhost:5432 -t 20 && java -jar /app/todo-app-0.1.jar
+    # command: wait-for-it.sh localhost:5432 -t 20 && java -jar /app/todo-app-0.1.jar
+    # command: 127.0.0.1:5440 -t 20 && java -jar /app/todo-app-0.1.jar
+    networks:
+      - app_db_net
 #    entrypoint:
     environment:
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/todo_db
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres_db:5440/todo_db
       - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
       - SPRING_DATASOURCE_USERNAME=postgres
       - SPRING_DATASOURCE_PASSWORD=postgres
       - SPRING_JPA_HIBERNATE_DDL_AUTO=update
       - SPRING_FLYWAY_USER=postgres
       - SPRING_FLYWAY_PASSWORD=postgres
+
+networks:
+  app_db_net:
+    driver: bridge
+#    external: true
+#    name: project
+
 volumes:
   postgres-data:

src/main/resources/application.properties

@@ -3,13 +3,13 @@ management.endpoints.web.exposure.include=health,info,shutdown
 #logging.level.root=debug
 
 # setting up Postgres DB
-spring.datasource.url=jdbc:postgresql://localhost:5432/todo_db
+spring.datasource.url=jdbc:postgresql://postgres_db:5440/todo_db
 spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.datasource.driverClassName=org.postgresql.Driver
 
 spring.flyway.enabled=true
-spring.flyway.url=jdbc:postgresql://localhost:5432/todo_db
+spring.flyway.url=jdbc:postgresql://postgres_db:5440/todo_db
 spring.flyway.driver-class-name=org.postgresql.Driver
 spring.flyway.schemas=public
 #spring.flyway.baseline-version=1