From 0d6a883721ba80a875df0205bbe4bc67f22e4250 Mon Sep 17 00:00:00 2001 From: DoTheEvolution Date: Wed, 20 May 2020 20:38:44 +0200 Subject: [PATCH] update --- README.md | 16 ++++++++-------- bitwarden_rs/readme.md | 4 ++-- bookstack/readme.md | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 77c5f15..4e518d0 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,8 @@ Often the `.env` file is used as `env_file` * `.env` - actual name of a file that is used only by compose.
It is used automatically just by being in the directory with the `docker-compose.yml`
- Variables set there are available during the building of the container, - but unless named in the `environment:` option they are not available + Variables in it are available during the building of the container, + but unless named in the `environment:` option, they are not available in the running containers. * `env_file` - an option in compose that defines an existing external file.
Variables in this file will be available in the running container, @@ -56,7 +56,7 @@ to also go in to compose to add/change it there..
Also the compose file looks less cramped. Only issue is that **all** variables from `.env` are available in -containers that use this method.
+containers that use this `env_file: .env` method.
That can lead to potential issues if you try to use this approach elsewhere, universally. @@ -64,8 +64,7 @@ universally. ### Images latest tag -All images are without any tag, which defaults to `latest` tag being used. - +All images are without any tag, which defaults to `latest` tag being used.
This is [frowned upon](https://vsupalov.com/docker-latest-tag/), but feel free to choose a version and sticking with it once it goes to real use. @@ -76,8 +75,8 @@ but feel free to choose a version and sticking with it once it goes to real use. No docker volumes are used. Directories and files from the host are bind mounted in to containers.
Don't feel like I know all of the aspects of this, -but I know its easier to edit a random file on a host, -or backup a directory when its just there, sitting on the host. +but I know it's easier to edit a random file on a host, +or backup a directory when it's just there, sitting on the host. --- @@ -88,7 +87,8 @@ a day. The configuration in `.env` files is almost universal, `apikey` is really the username, not some placeholder. -Only the password changes, which you generate in apikey section on SendGrid website. +Only the password(actual value of apikey) changes, +which you generate in apikey section on SendGrid website. --- diff --git a/bitwarden_rs/readme.md b/bitwarden_rs/readme.md index d84a48f..f197564 100644 --- a/bitwarden_rs/readme.md +++ b/bitwarden_rs/readme.md @@ -93,9 +93,9 @@ SMTP_SSL=true SMTP_EXPLICIT_TLS=true SMTP_HOST=smtp.sendgrid.net SMTP_PORT=465 -SMTP_USERNAME=apikey -SMTP_PASSWORD=SG.asdasdasdasdasdasd SMTP_FROM=admin@example.com +SMTP_USERNAME=apikey +SMTP_PASSWORD= ``` **All containers must be on the same network**.
diff --git a/bookstack/readme.md b/bookstack/readme.md index d9fbfd2..dd6b9c0 100644 --- a/bookstack/readme.md +++ b/bookstack/readme.md @@ -104,13 +104,13 @@ DB_PASS=bookstack DB_DATABASE=bookstack # USING SENDGRID FOR SENDING EMAILS +MAIL_ENCRYPTION=SSL MAIL_DRIVER=smtp MAIL_HOST=smtp.sendgrid.net MAIL_PORT=465 MAIL_FROM=book@example.com MAIL_USERNAME=apikey -MAIL_PASSWORD=SG.asaddasdasdasdsaasdasd -MAIL_ENCRYPTION=SSL +SMTP_PASSWORD= ``` **All containers must be on the same network**.