From df3ac05ac84d2f45aaedb28ab7f5007f935f1ea1 Mon Sep 17 00:00:00 2001
From: Joshua Schmitt <jqshuv@gmail.com>
Date: Thu, 14 Jul 2022 20:46:11 +0200
Subject: [PATCH] fix: :bug: fix env to docker-compose file

---
 .env.example           |  4 ----
 docker-compose.dev.yml | 36 ++++++++++++++++++------------------
 docker-compose.yml     | 36 ++++++++++++++++++------------------
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/.env.example b/.env.example
index dde1afc8..51665d33 100644
--- a/.env.example
+++ b/.env.example
@@ -6,11 +6,7 @@ DISCORD_CLIENT_ID=""
 DISCORD_GUILD_ID=""
 
 # Database
-# Comment this if youre using docker-compose
 MONGO_URL="mongodb+srv://username:password@host/database?retryWrites=true&w=majority"
-# Uncomment this if youre using docker-compose
-# MONGO_USER=YOUR_DOCKER_COMPOSE_MONGO_USER
-# MONGO_PASS=YOUR_DOCKER_COMPOSE_MONGO_PASSWORD
 
 # Encryption
 ENCRYPTION_ALGORITHM="aes-256-ctr"
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index b88dfdca..ba7a2ba4 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 
 services:
   app:
@@ -7,21 +7,21 @@ services:
     build: .
     restart: unless-stopped
     environment:
-      - DISCORD_TOKEN=${DISCORD_TOKEN}
-      - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID}
-      - DISCORD_GUILD_ID=${DISCORD_GUILD_ID}
-      - MONGO_URL=mongodb://${MONGO_USER}:${MONGO_PASS}@mongodb:27017/admin?retryWrites=true&w=majority
-      - ENCRYPTION_ALGORITHM=${ENCRYPTION_ALGORITHM}
-      - ENCRYPTION_SECRET=${ENCRYPTION_SECRET}
-      - EMEBD_COLOR_SUCCESS=${EMEBD_COLOR_SUCCESS}
-      - EMBED_COLOR_WAIT=${EMBED_COLOR_WAIT}
-      - EMBED_COLOR_ERROR=${EMBED_COLOR_ERROR}
-      - EMBED_FOOTER_TEXT=${EMBED_FOOTER_TEXT}
-      - EMBED_FOOTER_ICON=${EMBED_FOOTER_ICON}
-      - LOG_LEVEL=${LOG_LEVEL}
-      - REPUTATION_TIMEOUT=${REPUTATION_TIMEOUT}
-      - BOT_HOSTER_NAME=${BOT_HOSTER_NAME}
-      - BOT_HOSTER_URL=${BOT_HOSTER_URL}
+      - DISCORD_TOKEN=DISCORD_TOKEN
+      - DISCORD_CLIENT_ID=DISCORD_CLIENT_ID
+      - DISCORD_GUILD_ID=DISCORD_GUILD_ID
+      - MONGO_URL=mongodb://MONGO_USER:MONGO_PASS@mongodb:27017/admin?retryWrites=true&w=majority
+      - ENCRYPTION_ALGORITHM=ENCRYPTION_ALGORITHM
+      - ENCRYPTION_SECRET=ENCRYPTION_SECRET
+      - EMEBD_COLOR_SUCCESS=EMEBD_COLOR_SUCCESS
+      - EMBED_COLOR_WAIT=EMBED_COLOR_WAIT
+      - EMBED_COLOR_ERROR=EMBED_COLOR_ERROR
+      - EMBED_FOOTER_TEXT=EMBED_FOOTER_TEXT
+      - EMBED_FOOTER_ICON=EMBED_FOOTER_ICON
+      - LOG_LEVEL=LOG_LEVEL
+      - REPUTATION_TIMEOUT=REPUTATION_TIMEOUT
+      - BOT_HOSTER_NAME=BOT_HOSTER_NAME
+      - BOT_HOSTER_URL=BOT_HOSTER_URL
       - NODE_ENV=development
     stdin_open: true
     tty: true
@@ -31,7 +31,7 @@ services:
     image: mongo:latest
     restart: unless-stopped
     environment:
-      MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER}
-      MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASS}
+      MONGO_INITDB_ROOT_USERNAME: MONGO_USER
+      MONGO_INITDB_ROOT_PASSWORD: MONGO_PASS
     volumes:
       - ./database:/data/db
diff --git a/docker-compose.yml b/docker-compose.yml
index ef0c4450..2d67fb53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 
 services:
   app:
@@ -7,21 +7,21 @@ services:
     image: zyner/xyter:latest
     restart: unless-stopped
     environment:
-      - DISCORD_TOKEN=${DISCORD_TOKEN}
-      - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID}
-      - DISCORD_GUILD_ID=${DISCORD_GUILD_ID}
-      - MONGO_URL=mongodb://${MONGO_USER}:${MONGO_PASS}@mongodb:27017/admin?retryWrites=true&w=majority
-      - ENCRYPTION_ALGORITHM=${ENCRYPTION_ALGORITHM}
-      - ENCRYPTION_SECRET=${ENCRYPTION_SECRET}
-      - EMEBD_COLOR_SUCCESS=${EMEBD_COLOR_SUCCESS}
-      - EMBED_COLOR_WAIT=${EMBED_COLOR_WAIT}
-      - EMBED_COLOR_ERROR=${EMBED_COLOR_ERROR}
-      - EMBED_FOOTER_TEXT=${EMBED_FOOTER_TEXT}
-      - EMBED_FOOTER_ICON=${EMBED_FOOTER_ICON}
-      - LOG_LEVEL=${LOG_LEVEL}
-      - REPUTATION_TIMEOUT=${REPUTATION_TIMEOUT}
-      - BOT_HOSTER_NAME=${BOT_HOSTER_NAME}
-      - BOT_HOSTER_URL=${BOT_HOSTER_URL}
+      - DISCORD_TOKEN=DISCORD_TOKEN
+      - DISCORD_CLIENT_ID=DISCORD_CLIENT_ID
+      - DISCORD_GUILD_ID=DISCORD_GUILD_ID
+      - MONGO_URL=mongodb://MONGO_USER:MONGO_PASS@mongodb:27017/admin?retryWrites=true&w=majority
+      - ENCRYPTION_ALGORITHM=ENCRYPTION_ALGORITHM
+      - ENCRYPTION_SECRET=ENCRYPTION_SECRET
+      - EMEBD_COLOR_SUCCESS=EMEBD_COLOR_SUCCESS
+      - EMBED_COLOR_WAIT=EMBED_COLOR_WAIT
+      - EMBED_COLOR_ERROR=EMBED_COLOR_ERROR
+      - EMBED_FOOTER_TEXT=EMBED_FOOTER_TEXT
+      - EMBED_FOOTER_ICON=EMBED_FOOTER_ICON
+      - LOG_LEVEL=LOG_LEVEL
+      - REPUTATION_TIMEOUT=REPUTATION_TIMEOUT
+      - BOT_HOSTER_NAME=BOT_HOSTER_NAME
+      - BOT_HOSTER_URL=BOT_HOSTER_URL
       - NODE_ENV=production
     stdin_open: true
     tty: true
@@ -31,7 +31,7 @@ services:
     image: mongo:latest
     restart: unless-stopped
     environment:
-      MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER}
-      MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASS}
+      MONGO_INITDB_ROOT_USERNAME: MONGO_USER
+      MONGO_INITDB_ROOT_PASSWORD: MONGO_PASS
     volumes:
       - ./database:/data/db