link database

build.sh

@@ -2,4 +2,5 @@
 
 ./halt.sh
 docker-compose -f ./docker-compose_build.yml build
-docker-compose -f ./docker-compose_build.yml up
+docker-compose -f ./docker-compose_build.yml up -d
+docker-compose stop db
\ No newline at end of file

config/application.yml

@@ -2,9 +2,9 @@
 
 spring:
   datasource:
-    url: jdbc:postgresql://portaldb:5432/postgres
+    url: jdbc:postgresql://db:5432/postgres
     username: postgres
-    password: test
+    password: pass
     driver-class-name: org.postgresql.Driver
   jpa:
     hibernate:

docker-compose.yml

@@ -6,5 +6,18 @@ services:
     build:
       context: .
       dockerfile: ./src/docker/run/Dockerfile
+    depends_on:
+      - "db"
     ports:
       - "8080:8080"
+    links:
+      - "db"
+  db:
+      container_name: db
+      image: postgres:9.5.3
+      ports:
+        - "5432:5432"
+      volumes:
+        - ./data:/var/lib/postgres/data
+      environment:
+        POSTGRES_USER: postgres

docker-compose_build.yml

@@ -4,8 +4,21 @@ services:
   backend_build:
     container_name: backend_build
     build: ./src/docker/build/
+    depends_on:
+      - "db"
     volumes:
       - ./:/opt/portal/
       - .m2:/root/.m2/
     ports:
       - "8080:8080"
+    links:
+      - "db"
+  db:
+    container_name: db
+    image: postgres:9.5.3
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./data:/var/lib/postgres/data
+    environment:
+      POSTGRES_USER: postgres

pom.xml

@@ -27,6 +27,8 @@
         <sonar.host.url>http://dockerhost:9000</sonar.host.url>
         <sonar.projectName>MIP Backend</sonar.projectName>
         <sonar.sources>src/main/java/</sonar.sources>
+        <flyway.url>jdbc:postgresql://db:5432/postgres</flyway.url>
+        <flyway.user>postgres</flyway.user>
     </properties>
 
     <dependencies>

src/docker/build/Dockerfile

@@ -5,4 +5,6 @@ COPY ./build-in-docker.sh /build-in-docker.sh
 VOLUME /opt/portal/
 WORKDIR /opt/portal/
 
+RUN apt-get update && apt-get install -y postgresql
+
 CMD ["bash", "/build-in-docker.sh"]

src/docker/build/build-in-docker.sh

@@ -3,5 +3,13 @@
 rm -r target/
 mvn package
 
+echo 'Waiting for postgres to be ready...'
+until psql -h "db" -U "postgres" -c '\l'; do
+  >&2 echo "Postgres is unavailable - sleeping"
+  sleep 1
+done
+
+mvn flyway:baseline flyway:migrate
+
 # Uncomment to generate a PDF API documentation
 # mvn swagger2markup:convertSwagger2markup asciidoctor:process-asciidoc