Update README and docker-compose

Author: nixos89

README.md

@@ -19,8 +19,12 @@ To properly set up and run the app perform following steps:
 5. Before 2nd and every other app run (i.e. before executing Step4) set `spring.flyway.enabled` property to `false` located in `src/main/resources/application.properties` 
 
 ## 2. App containerization
-If you prefer not to have...
-#TODO: Finish this!!!!!!!!!!!!!
+If you prefer not to have needed Postgres 12 version installed on your computer locally you can run docker-compose.
+In that use case you need to:
+1. Disable port 5432 in order for containerized Postgres image to run
+2. Create docker network named `app_db_net`.
+
+Finally, execute `docker compose up -d` command to start both application and database containers. 
 
 
 ## 3. REST Endpoints

docker-compose.yml

@@ -1,4 +1,3 @@
-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
@@ -13,6 +12,7 @@ services:
     image: postgres:12.9
     restart: always
     container_name: postgres_db
+    hostname: postgres_db
     volumes:
       - postgres-data:/var/lib/postgresql/data
 #      - postgres-data:/var/lib/postgresql/data
@@ -22,37 +22,44 @@ services:
       POSTGRES_DB: todo_db
       # TODO: try mapping to different host and container ports
     networks:
-      - app_db_net
+      app_db_net:
+        aliases:
+            - postgres_db
+            - app
     ports:
       - "5432:5432"
 
   app:
     #image: openjdk:8
     build: .
-    image: nixos89/todo_app:0.2
+    image: nixos89/todo_app:0.1
+    restart: on-failure
     container_name: todo_app
+    hostname: postgres_db
     depends_on:
-      - postgres_db
+      - "postgres_db"
     ports:
       - "8080:8080"
     volumes:
       - ./build/libs:/app
     networks:
-      - app_db_net
+      app_db_net:
+        aliases:
+          - postgres_db
+          - app
     environment:
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres_db:5432/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
+      SPRING_DATASOURCE_URL: jdbc:postgresql://postgres_db:5432/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: