From 09eea0efdcfcb9d6659f8597e416d52991bddc94 Mon Sep 17 00:00:00 2001 From: Mirco Nasuti <mirco.nasuti@chuv.ch> Date: Tue, 12 Jul 2016 12:25:33 +0200 Subject: [PATCH] check if baseline needed --- clean.sh | 1 + docker-compose.yml | 2 +- docker-compose_build.yml | 2 +- src/docker/build/build-in-docker.sh | 6 +++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clean.sh b/clean.sh index 41fc76f1b..f46a6c89e 100755 --- a/clean.sh +++ b/clean.sh @@ -3,3 +3,4 @@ ./halt.sh sudo rm -r ./.m2/ sudo rm -r ./target/ +sudo rm -f ./data/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index df1c7f0bf..29d63572d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,6 @@ services: ports: - "5432:5432" volumes: - - ./data:/var/lib/postgres/data + - ./data:/var/lib/postgres/ environment: POSTGRES_USER: postgres diff --git a/docker-compose_build.yml b/docker-compose_build.yml index 877c4ebf3..2e2636daa 100644 --- a/docker-compose_build.yml +++ b/docker-compose_build.yml @@ -19,6 +19,6 @@ services: ports: - "5432:5432" volumes: - - ./data:/var/lib/postgres/data + - ./data:/var/lib/postgresql/data environment: POSTGRES_USER: postgres diff --git a/src/docker/build/build-in-docker.sh b/src/docker/build/build-in-docker.sh index 70736859a..eb1132737 100644 --- a/src/docker/build/build-in-docker.sh +++ b/src/docker/build/build-in-docker.sh @@ -9,7 +9,11 @@ until psql -h "db" -U "postgres" -c '\l'; do sleep 1 done -mvn flyway:baseline flyway:migrate +if [$(psql -h "db" -U "postgres" -c "\dt" | grep schema_version | wc -l) == 0]; then + mvn flyway:baseline +fi + +mvn flyway:migrate # Uncomment to generate a PDF API documentation # mvn swagger2markup:convertSwagger2markup asciidoctor:process-asciidoc -- GitLab