Fix dev prepare-db

Author: xmnlab

Makefile

@@ -68,7 +68,7 @@ docker-wait-all:
 docker-dev-prepare-db:
 	# used for development
 	$(DOCKER) exec -T epigraphhub-superset \
-		bash /opt/EpiGraphHub/docker/postgresql/prepare-db.sh
+		bash /opt/EpiGraphHub/docker/postgresql/dev/prepare-db.sh
 
 
 .PHONY:docker-run-cron

docker/postgresql/prepare-db.sh docker/postgresql/dev/prepare-db.shdocker/postgresql/prepare-db.sh renamed to docker/postgresql/dev/prepare-db.sh

@@ -6,14 +6,14 @@
 
 set -ex
 
-DOCKER_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
+DOCKER_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd ../.. && pwd )"
 PSQL_CONNECTION="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}"
 
 echo "[II] CREATE DATABASE"
-psql "${PSQL_CONNECTION}/postgres" < ${DOCKER_DIR}/sql/database.sql
+psql "${PSQL_CONNECTION}/postgres" < ${DOCKER_DIR}/sql/dev/database.sql
 
 echo "[II] LOAD EPIGRAPHHUB DUMP"
-psql "${PSQL_CONNECTION}/${POSTGRES_DB}" < ${DOCKER_DIR}/sql/epigraphhub.sql
+psql "${PSQL_CONNECTION}/${POSTGRES_EPIGRAPH_DB}" < ${DOCKER_DIR}/sql/dev/epigraphhub.sql
 
 echo "[II] LOAD PRIVATE DUMP"
-psql "${PSQL_CONNECTION}/${POSTGRES_DB_PRIVATE}" < ${DOCKER_DIR}/sql/privatehub.sql
+psql "${PSQL_CONNECTION}/${POSTGRES_EPIGRAPH_DB_PRIVATE}" < ${DOCKER_DIR}/sql/dev/privatehub.sql