Fixed some Dockerfile bugs

3 files changed, 8 insertions, 7 deletions

diff --git a/cron/Dockerfile b/cron/Dockerfile
index 21aa4e4..821b48a 100755
--- a/cron/Dockerfile
+++ b/cron/Dockerfile
@@ -1,7 +1,7 @@
 FROM reg.reaweb.uk/smallytchannelbot
 MAINTAINER Eden Attenborough "eddie.atten.ea29@gmail.com"
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get install -y tzdata cron mysql-client
+RUN apt-get install -y tzdata cron mariadb-client
 COPY . /app
 WORKDIR /app
 RUN pip3 install -r cron/requirements.txt
@@ -9,4 +9,4 @@ RUN pip3 install -r cron/requirements.txt
 RUN echo "@daily root python3 /app/cron/daily.py > /proc/1/fd/1 2>/proc/1/fd/2" > /etc/crontab
 RUN echo "@hourly root python3 /app/cron/hourly.py > /proc/1/fd/1 2>/proc/1/fd/2" >> /etc/crontab
 ENTRYPOINT ["bash"]
-CMD ["entrypoint.sh"]
+CMD ["/app/cron/entrypoint.sh"]
diff --git a/cron/requirements.txt b/cron/requirements.txt
index 465e808..86f552b 100755
--- a/cron/requirements.txt
+++ b/cron/requirements.txt
@@ -1,2 +1,3 @@
-matplotlib==3.3.4
+numpy==1.26.4
+matplotlib
 discord-webhook
diff --git a/subreddit.py b/subreddit.py
index 8e00915..219f59a 100755
--- a/subreddit.py
+++ b/subreddit.py
@@ -16,10 +16,10 @@ import json
 import re
 import os
 
-if os.path.split(os.getcwd())[-1] == "onceaday":
-    configpath = "../config.json"
-else:
-    configpath = "config.json"
+
+configpath = os.path.join(os.path.dirname(__file__), "config.json")
+if not os.path.exists(configpath):
+    configpath = os.path.join(os.path.dirname(__file__), "..", "config.json")
 
 with open(configpath, "r") as f:
     CONFIG = json.load(f)