Merge pull request #816 from zmariscal/feature--add-postgresql

Feature:  add postgresql to Docker and docker compose file

Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /usr/src/app
 
 # Install system packages
 RUN apt-get update -qq && \
-    apt-get install -y default-mysql-client vim && \
+    apt-get install -y default-mysql-client postgresql postgresql-contrib vim && \
     apt-get clean
 
 # Set environment variables

docker-compose.yml

@@ -9,6 +9,13 @@ services:
     ports:
       - "3306:3306"
 
+  postgresql:
+    image: postgres:latest
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+
   app:
     build:
       context: .
@@ -19,7 +26,9 @@ services:
       - .:/usr/src/app
     depends_on:
       - mysql
+      - postgresql
     command: tail -f /dev/null
 
 volumes:
   mysql-data:
+  postgresql-data:

test/database.yml.sample

@@ -20,6 +20,7 @@ postgresql: &postgresql
   <<: *common
   username: postgres
   adapter: postgresql
+  host: postgresql
   min_messages: warning
 
 postresql_makara:

test/support/shared_examples/recursive_import.rb

@@ -147,7 +147,7 @@ def should_support_recursive_import
       end
 
       books.each do |book|
-        assert_equal book.topic_id, nil
+        assert_nil book.topic_id, nil
       end
     end