diff options
| author |  kwzrd <[email protected]> | 2021-03-28 14:53:16 +0200 |
|---|---|---|
| committer | kwzrd <[email protected]> | 2021-03-28 14:53:16 +0200 |
| commit | 4b1e90feab0cb6fc1eef708b709d1d2ed25ddbdc (patch) | |
| tree | e041f7bb680414356bfba11be4d9ffc318c1d253 /docker-compose.yml | |
| parent | Branding: add contextual message to #changelog notifications (diff) | |
| parent | Merge pull request #1466 from vcokltfre/discord-tags (diff) | |
Merge: changes from 'upstream/main' & conflict resolution
Conflict in the lockfile resolved by re-locking the merged Pipfile.
Conflict in Branding constants resolved by keeping my local version.
Change in the cog's target branch to 'main' from 'master' is currently
irrelevant as we targets a development branch anyway.
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 0002d1d56..8afdd6ef1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,8 +57,7 @@ services: - web - redis - snekbox + env_file: + - .env environment: - BOT_TOKEN: ${BOT_TOKEN} BOT_API_KEY: badbot13m0n8f570f942013fc818f234916ca531 - REDDIT_CLIENT_ID: ${REDDIT_CLIENT_ID} - REDDIT_SECRET: ${REDDIT_SECRET} |