diff --git a/backend/doc/database_setup.md b/backend/doc/database_setup.md index 765f928119..af83a84f8b 100644 --- a/backend/doc/database_setup.md +++ b/backend/doc/database_setup.md @@ -6,18 +6,18 @@ 1. follow the [instructions](https://docs.docker.com/desktop/mac/install/) to install docker. 2. open terminal and run: `docker pull postgres` -3. run `make init_docker` if you have not run before. You can find out the running container by run `docker ps` +3. run `make init_postgres` if you have not run before. You can find out the running container by run `docker ps` ``` CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES bfcdd6369e89 postgres "docker-entrypoint.s…" 19 minutes ago Up 19 minutes 0.0.0.0:5433->5432/tcp, :::5433->5432/tcp brave_bassi ``` -4. run `make init_database`. It will create the database on the remote specified by DATABASE_URL. You can connect you database using +4. run `make init_database`. It will create the database scheme on remote specified by DATABASE_URL. You can connect you database using pgAdmin. ![img_2.png](img_2.png) -The information you enter must be the same as the `make init_docker`. e.g. +The information you enter must be the same as the `make init_postgres`. e.g. ``` export DB_USER=postgres export DB_PASSWORD=password diff --git a/backend/scripts/database/database.mk b/backend/scripts/database/database.mk index 1b0e46588e..6b44a8b195 100644 --- a/backend/scripts/database/database.mk +++ b/backend/scripts/database/database.mk @@ -6,11 +6,11 @@ export DB_PORT=5433 export DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@localhost:${DB_PORT}/${DB_NAME} export ROOT = "./scripts/database" -init_docker: - ${ROOT}/docker.sh +init_postgres: + ${ROOT}/init_postgres.sh init_database: - ${ROOT}/db_init.sh + ${ROOT}/init_database.sh reset_db: #diesel database reset diff --git a/backend/scripts/database/db_init.sh b/backend/scripts/database/init_database.sh similarity index 100% rename from backend/scripts/database/db_init.sh rename to backend/scripts/database/init_database.sh diff --git a/backend/scripts/database/docker.sh b/backend/scripts/database/init_postgres.sh similarity index 100% rename from backend/scripts/database/docker.sh rename to backend/scripts/database/init_postgres.sh