From d0f1cdf1c7c95d639dc54ec830925ab62579b19c Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 12 Jul 2016 14:35:31 +0200
Subject: [PATCH] clean + trying to persist psql data
---
build.sh | 7 +------
docker-compose.yml | 16 ++++++++--------
docker-compose_build.yml | 2 +-
src/docker/build/build-in-docker.sh | 5 +++++
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/build.sh b/build.sh
index da082965a..e29e8d770 100755
--- a/build.sh
+++ b/build.sh
@@ -2,9 +2,4 @@
./halt.sh
docker-compose -f ./docker-compose_build.yml build
-docker-compose -f ./docker-compose_build.yml up -d
-
-until [ -e ./target/backend-services-DOCKER_BUILD.jar ]; do
- echo 'Waiting...'
- sleep 1
-done
+docker-compose -f ./docker-compose_build.yml run --rm backend_build
diff --git a/docker-compose.yml b/docker-compose.yml
index 29d63572d..16e2a9cfd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,11 +13,11 @@ services:
links:
- "db"
db:
- container_name: db
- image: postgres:9.5.3
- ports:
- - "5432:5432"
- volumes:
- - ./data:/var/lib/postgres/
- environment:
- POSTGRES_USER: postgres
+ container_name: db
+ image: postgres:9.5.3
+ ports:
+ - "5432:5432"
+ volumes:
+ - ./postgresql:/var/lib/postgresql
+ environment:
+ POSTGRES_USER: postgres
diff --git a/docker-compose_build.yml b/docker-compose_build.yml
index 2e2636daa..a554fa6ca 100644
--- a/docker-compose_build.yml
+++ b/docker-compose_build.yml
@@ -19,6 +19,6 @@ services:
ports:
- "5432:5432"
volumes:
- - ./data:/var/lib/postgresql/data
+ - ./postgresql:/var/lib/postgresql
environment:
POSTGRES_USER: postgres
diff --git a/src/docker/build/build-in-docker.sh b/src/docker/build/build-in-docker.sh
index df6b8c085..44f5005d0 100644
--- a/src/docker/build/build-in-docker.sh
+++ b/src/docker/build/build-in-docker.sh
@@ -1,6 +1,9 @@
#!/usr/bin/env bash
+echo 'Removing old target folder...'
rm -r target/
+
+echo 'Packaging...'
mvn package
echo 'Waiting for postgres to be ready...'
@@ -10,9 +13,11 @@ until psql -h "db" -U "postgres" -c '\l'; do
done
if [ $(psql -h "db" -U "postgres" -c "\dt" | grep schema_version | wc -l) == 0 ]; then
+ echo 'Generating database baseline...'
mvn flyway:baseline
fi
+echo 'Migrating database...'
mvn flyway:migrate
# Uncomment to generate a PDF API documentation
--
GitLab