From b1740e1575c59e62f106a6125359e612c506b8ee Mon Sep 17 00:00:00 2001 From: wkyoshida Date: Sat, 23 Mar 2024 13:41:16 -0300 Subject: [PATCH 1/2] docs: Update docker commands to specify --env-file --- CONTRIBUTING.md | 6 +++--- README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b770f952f..868dc1ecf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -182,10 +182,10 @@ git remote add upstream https://github.com/activist-org/activist.git 4. Start your docker images with the following: ```bash - docker compose up + docker compose --env-file .env.dev up # Or with new dependencies: - # docker compose up --build + # docker compose --env-file .env.dev up --build # And to stop the containers when you're done working: # docker compose down @@ -226,7 +226,7 @@ You can then visit http://localhost:3000/ to see the development frontend build Our backend depends on a connection to a postgres DB, therefore we need to setup the database first. Here our best option is to still use docker to create a postgres DB with the following command: ```bash -docker compose up db +docker compose --env-file .env.dev up db ``` In order to connect to the DB, we need to change the `DATABASE_HOST` environment variable inside the `.env.dev` file first. diff --git a/README.md b/README.md index 43223005d..4a144b26f 100644 --- a/README.md +++ b/README.md @@ -176,10 +176,10 @@ git remote add upstream https://github.com/activist-org/activist.git 4. Start your docker images with the following: ```bash - docker compose up + docker compose --env-file .env.dev up # Or with new dependencies: - # docker compose up --build + # docker compose --env-file .env.dev up --build # And to stop the containers when you're done working: # docker compose down From f9dd4a45a5f4b09217735565ea263ecf96be4452 Mon Sep 17 00:00:00 2001 From: wkyoshida Date: Sat, 23 Mar 2024 13:55:41 -0300 Subject: [PATCH 2/2] docs: Update 'docker compose down' command to specify --env-file --- CONTRIBUTING.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 868dc1ecf..ffad03f22 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -188,7 +188,7 @@ git remote add upstream https://github.com/activist-org/activist.git # docker compose --env-file .env.dev up --build # And to stop the containers when you're done working: - # docker compose down + # docker compose --env-file .env.dev down ``` 5. You can visit to see the development build once the container is up and running. diff --git a/README.md b/README.md index 4a144b26f..15bb4df9d 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ git remote add upstream https://github.com/activist-org/activist.git # docker compose --env-file .env.dev up --build # And to stop the containers when you're done working: - # docker compose down + # docker compose --env-file .env.dev down ``` 5. You can then visit to see the development frontend build once the container is up and running.