move userdb to docker-compose-database

.gitignore

@@ -76,3 +76,4 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 /db
+/userdb

docker-compose-database.yml

@@ -22,8 +22,29 @@ services:
       timeout: 5s
       retries: 20
 
+  userdb:
+    image: postgres
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=admin
+      - POSTGRES_DB=users
+      - PGDATA=/data/postgres
+    expose:
+      - "5432"
+    restart: unless-stopped
+    volumes:
+      - ./userdb:/data/postgres
+    networks:
+      - backend
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
+      interval: 5s
+      timeout: 5s
+      retries: 20
+
 volumes:
   postgres:
+  userdb:
 
 networks:
   backend:

docker-compose.yml

@@ -84,21 +84,6 @@ services:
       - rabbitmq
       - discovery
       - gateway
-      - userdb
-    networks:
-      - backend
-
-  userdb:
-    image: postgres
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=password
-      - POSTGRES_DB=users
-    expose:
-      - "5432"
-    restart: always
-    volumes:
-      - ./db:/var/lib/postgres
     networks:
       - backend
 

user-service/src/main/resources/application.properties

@@ -11,8 +11,8 @@ eureka.instance.instance-id=${spring.application.name}:${spring.application.inst
 spring.datasource.driver-class-name=org.postgresql.Driver
 #spring.datasource.url=jdbc:postgresql://localhost:5432/users?createDatabaseIfNotExist=true&autoReconnect=true&useSSL=false&useUnicode=yes&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&currentSchema=public
 spring.datasource.url=jdbc:postgresql://userdb:5432/users
-spring.datasource.username=postgres
-spring.datasource.password=password
+spring.datasource.username=admin
+spring.datasource.password=admin
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=create
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect