From 0da43cac1966acff2bcf6e79a38b77bb6749a91c Mon Sep 17 00:00:00 2001 From: Robert Biter Date: Tue, 2 Aug 2016 13:56:44 +0200 Subject: [PATCH] removed unused schema.recreate property --- DOCKER.md | 2 +- Makefile | 4 ++-- docker-compose.yml | 1 - scripts/generate-docker-file.sh | 2 +- src/it/resources/application.conf | 1 - src/main/resources/sample.application.conf | 3 --- src/main/resources/travis.application.conf | 1 - 7 files changed, 4 insertions(+), 10 deletions(-) diff --git a/DOCKER.md b/DOCKER.md index a73e5e4..35b171c 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -12,4 +12,4 @@ If parameters are not specified then default values are used. Default image name ## How to run a docker image - docker run -p 9080:9080 -e INNKEEPER_ENV=test -e SCHEMA_RECREATE=true zalando/innkeeper:latest \ No newline at end of file + docker run -p 9080:9080 -e INNKEEPER_ENV=test zalando/innkeeper:latest diff --git a/Makefile b/Makefile index 7c9374f..f507d06 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ docker-push: docker-run: docker run -p 9080:9080 \ - -e INNKEEPER_ENV=dev -e SCHEMA_RECREATE=true \ + -e INNKEEPER_ENV=dev \ -t pierone.stups.zalan.do/pathfinder/innkeeper:$(version) docker-snapshot: @@ -21,7 +21,7 @@ docker-push-snapshot: docker-run-snapshot: docker run -p 9080:9080 \ - -e INNKEEPER_ENV=test -e SCHEMA_RECREATE=true \ + -e INNKEEPER_ENV=test \ -t pierone.stups.zalan.do/pathfinder/innkeeper:latest-SNAPSHOT test-db: diff --git a/docker-compose.yml b/docker-compose.yml index 56ff9c9..2c86cf5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,6 @@ innkeeper: - "9080:9080" environment: - INNKEEPER_ENV=acceptance-test - - SCHEMA_RECREATE=true links: - db - oauth diff --git a/scripts/generate-docker-file.sh b/scripts/generate-docker-file.sh index ba781ff..29adef2 100755 --- a/scripts/generate-docker-file.sh +++ b/scripts/generate-docker-file.sh @@ -12,5 +12,5 @@ echo "" >> Dockerfile echo "WORKDIR /opt/innkeeper" >> Dockerfile echo "" >> Dockerfile echo "ENTRYPOINT java \$(java-dynamic-memory-opts) \\" >> Dockerfile -echo " -Dinnkeeper.env=\$INNKEEPER_ENV -D\$INNKEEPER_ENV.schema.recreate=\$SCHEMA_RECREATE \\" >> Dockerfile +echo " -Dinnkeeper.env=\$INNKEEPER_ENV \\" >> Dockerfile echo " -server -jar innkeeper-assembly-$1.jar" >> Dockerfile diff --git a/src/it/resources/application.conf b/src/it/resources/application.conf index 254a32b..2a58137 100644 --- a/src/it/resources/application.conf +++ b/src/it/resources/application.conf @@ -10,7 +10,6 @@ test { keepAliveConnection = true numThreads = 5 } - schema.recreate = "true" defaultNumberOfMinutesToActivateRoute = 0 admin.teams=["team3"] diff --git a/src/main/resources/sample.application.conf b/src/main/resources/sample.application.conf index de25a1b..2856a8d 100644 --- a/src/main/resources/sample.application.conf +++ b/src/main/resources/sample.application.conf @@ -10,7 +10,6 @@ dev { keepAliveConnection = true numThreads = 5 } - schema.recreate = "true" defaultNumberOfMinutesToActivateRoute = 0 team.member.service.url="http://team:6768/api/teams?member=" @@ -39,7 +38,6 @@ prod { keepAliveConnection = true numThreads = 5 } - schema.recreate = "false" defaultNumberOfMinutesToActivateRoute = 1 team.member.service.url="http://team.service/api/teams?member=" @@ -68,7 +66,6 @@ acceptance-test { keepAliveConnection = true numThreads = 5 } - schema.recreate = "true" defaultNumberOfMinutesToActivateRoute = 0 team.member.service.url="http://team:6768/api/teams?member=" diff --git a/src/main/resources/travis.application.conf b/src/main/resources/travis.application.conf index ae2f732..ea6f475 100644 --- a/src/main/resources/travis.application.conf +++ b/src/main/resources/travis.application.conf @@ -8,7 +8,6 @@ acceptance-test { keepAliveConnection = true numThreads = 5 } - schema.recreate = "true" defaultNumberOfMinutesToActivateRoute = 0 team.member.service.url="http://team:6768/api/teams?member="