Merge pull request #50 from vadeg/replace-vagrant-with-docker

Fixes #49: Replace Vagrant with Docker for local database setup and f…

Author: vadeg

.travis.yml

@@ -7,7 +7,7 @@ jdk:
 dist: trusty
 
 addons:
-    postgresql: "9.6"
+    postgresql: "9.6.10"
 
 # go faster on travis
 sudo: false

Vagrantfile

@@ -0,0 +1,8 @@
+version: '3'
+services:
+  db:
+    image: 'postgres:9.6.10'
+    environment:
+      POSTGRES_PASSWORD: 'postgres'
+    ports:
+      - '5432:5432'

docker-compose.yml

@@ -12,12 +12,12 @@
     </appender>
 
     <logger name="de.zalando.sprocwrapper" additivity="false">
-        <level value="trace"/>
+        <level value="debug"/>
         <appender-ref ref="default"/>
     </logger>
 
     <logger name="de.zalando.typemapper" additivity="false">
-        <level value="trace"/>
+        <level value="debug"/>
         <appender-ref ref="default"/>
     </logger>
 

src/test/resources/log4j.xml

@@ -16,13 +16,12 @@ if nc -w 5 -z localhost 5432; then
     exit 1
 fi
 
-PGVERSION=9.5.4
+PGVERSION=9.6.10
 
 container=$(docker ps | grep postgres:$PGVERSION)
 if [ -z "$container" ]; then
-    docker rm postgres
     echo 'Starting PostgreSQL instance..'
-    docker run --name postgres -p 5432:5432 -e POSTGRES_PASSWORD=postgres -d postgres:$PGVERSION
+    docker-compose up -d
 fi
 
 until nc -w 5 -z localhost 5432; do
@@ -33,8 +32,9 @@ done
 sleep 5
 
 echo 'Running tests..'
-export MAVEN_OPTS="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+# Uncomment if need to run tests with debug
+#export MAVEN_OPTS="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
 ./mvnw clean verify -Pintegration-test
 
 echo 'Stopping PostgreSQL instance..'
-docker stop postgres
+docker-compose down