From acf433ff26c7dcae93c86dff4b2d2442ed3c438a Mon Sep 17 00:00:00 2001
From: KEriks <git@72.lv>
Date: Fri, 6 Aug 2021 14:23:00 +0300
Subject: [PATCH] Bugfixes

---
 Dockerfile          | 10 +++++-----
 dbot/discord_bot.py |  1 +
 docker_run.sh       |  3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6aaa3d8..e94ff0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM python:3.9-slim
 WORKDIR /app
+COPY ./run.sh /run.sh
 RUN groupadd -g 1000 discordbot \
  && useradd -u 1000 -g 1000 discordbot \
  && mkdir /home/discordbot \
  && chown -R discordbot:discordbot /app \
- && chown -R discordbot:discordbot /home/discordbot
+ && chown -R discordbot:discordbot /home/discordbot \
+ && chmod +x /run.sh
 
 USER discordbot
 COPY requirements.txt /app/requirements.txt
-COPY ./run.sh /run.sh
-RUN pip install -r requirements.txt && chmod +x /run.sh
-
+RUN pip install -r requirements.txt
 #CMD python discord_bot.py
-ENTRYPOINT ['/run.sh', 'docker']
+ENTRYPOINT ["/usr/local/bin/python", "/app/discord_bot.py"]
diff --git a/dbot/discord_bot.py b/dbot/discord_bot.py
index c22da1d..d00299d 100644
--- a/dbot/discord_bot.py
+++ b/dbot/discord_bot.py
@@ -44,6 +44,7 @@ PRODUCTION = bool(os.getenv("PRODUCTION"))
 DB = DiscordDB(DB_NAME)
 
 if PRODUCTION:
+    logger.warning("Production mode enabled!")
     logger.setLevel(logging.INFO)
     _ts = int(time.time())
     for c_id in COUNTRIES.keys():
diff --git a/docker_run.sh b/docker_run.sh
index c50bf9f..d1c3124 100755
--- a/docker_run.sh
+++ b/docker_run.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 docker rm -f discord_bot
-
 set -e
 docker build --tag discord_epicbot .
-docker run --detach -v ./src:/app -v ./debug:/app/debug --env-file=".env" --restart=always --name discord_bot discord_epicbot
+docker run --detach -v $PWD/dbot:/app -v $PWD/debug:/app/debug --env-file=".env" --env PRODUCTION=1 --restart=always --name discord_bot discord_epicbot