From 36982d1eaa0e1f49e8139283eb37d6efbf8cfc59 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Wed, 27 Oct 2021 13:04:26 -0400 Subject: [PATCH 1/3] add database_url to docker-compose to support env concatenation --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index c7e6f74..5e6c4cf 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,6 +16,8 @@ services: - 3000:3000 - 5555:5555 env_file: .env + environment: + - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB} depends_on: - db volumes: From 3726b561ea3985fd1566bf307773b3091a4ddb80 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Wed, 27 Oct 2021 13:08:30 -0400 Subject: [PATCH 2/3] rename .env to .env.example to match calendso repo pattern --- .env => .env.example | 0 .gitignore | 4 ++++ 2 files changed, 4 insertions(+) rename .env => .env.example (100%) create mode 100644 .gitignore diff --git a/.env b/.env.example similarity index 100% rename from .env rename to .env.example diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d0c2418 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# .env file +.env \ No newline at end of file From e3050102bd2799fb401c75968fbba7c9aa570e4a Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Wed, 27 Oct 2021 13:09:48 -0400 Subject: [PATCH 3/3] update readme with .env.example rename instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7c4bee..44d25d2 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Make sure you have `docker` & `docker-compose` installed on the server / system. ```bash cd calendso-docker ``` -3. Update `.env` if needed +3. Rename `.env.example` to `.env` and update `.env` if needed. 4. Build and start calendso