Fix ridgepole

Author: gedorinku

db/docker-compose.yml

@@ -14,6 +14,14 @@ services:
       - hydra
     ports:
       - "127.0.0.1:3000:3000"
+  
+  ridgepole:
+    build: ./db
+    volumes:
+      - ./db:/db
+    environment:
+      - DATABASE_URL=${DATABASE_URL_RIDGEPOLE}
+      - TEST_DATABASE_URL=${TEST_DATABASE_URL_RIDGEPOLE}
 
   hydra-migrate:
     image: oryd/hydra:v1.0.0-rc.6_oryOS.10-alpine

docker-compose.yml

@@ -8,12 +8,12 @@ fi
 docker-compose exec pg psql -c 'create database accounts;' -U postgres
 docker-compose exec pg psql -c 'create database hydra;' -U postgres
 
-docker-compose -f db/docker-compose.yml build
+docker-compose build
 if [ $? -gt 0 ]; then
     exit $?
 fi
 
-docker-compose -f db/docker-compose.yml run --rm ridgepole -c env:DATABASE_URL --apply --dry-run
+docker-compose run --rm ridgepole -c env:DATABASE_URL --apply --dry-run
 if [ $? -gt 0 ]; then
     exit $?
 fi
@@ -27,4 +27,4 @@ while [ -z "$1" ]; do
     esac
 done
 
-docker-compose -f db/docker-compose.yml run --rm ridgepole -c env:DATABASE_URL --apply
+docker-compose run --rm ridgepole -c env:DATABASE_URL --apply

scripts/setup-db

@@ -7,12 +7,12 @@ fi
 
 docker-compose exec pg psql -c 'create database accounts_test;' -U postgres
 
-docker-compose -f db/docker-compose.yml build
+docker-compose build
 if [ $? -gt 0 ]; then
     exit $?
 fi
 
-docker-compose -f db/docker-compose.yml run --rm ridgepole -c env:TEST_DATABASE_URL --apply --dry-run
+docker-compose run --rm ridgepole -c env:TEST_DATABASE_URL --apply --dry-run
 if [ $? -gt 0 ]; then
     exit $?
 fi
@@ -26,4 +26,4 @@ while [ -z "$1" ]; do
     esac
 done
 
-docker-compose -f db/docker-compose.yml run --rm ridgepole -c env:TEST_DATABASE_URL --apply
+docker-compose run --rm ridgepole -c env:TEST_DATABASE_URL --apply