Fix broken ENV vars

.dockerignore

@@ -5,7 +5,6 @@ __pycache__
 *.pyo
 *.pyd
 .Python
-logs
-*.log
 env
 venv
+*.log

.gitignore

@@ -7,7 +7,6 @@ __pycache__/
 .vscode/
 
 # generated data from logging
-logs/
 *.log
 
 # venv

Dockerfile

@@ -4,12 +4,12 @@ WORKDIR /data
 
 COPY . /data
 
-ENV PREFIX
-ENV TOKEN
-ENV REDDIT_CLIENT_ID
-ENV REDDIT_CLIENT_SECRET
-ENV REDDIT_CLIENT_USERAGENT
+ENV PREFIX /data
+ENV TOKEN /data
+ENV REDDIT_CLIENT_ID /data
+ENV REDDIT_CLIENT_SECRET /data
+ENV REDDIT_CLIENT_USERAGENT /data
 
 RUN python3 -m pip install -r requirements.txt
 
-CMD python3 aquabot.py --prefix=$PREFIX --token=$TOKEN --reddit_client_id=$REDDIT_CLIENT_ID --reddit_client_secret=$REDDIT_CLIENT_SECRET --reddit_client_useragent=$REDDIT_CLIENT_USERAGENT
+CMD python3 aquabot.py

aquabot.py

@@ -22,31 +22,38 @@ import platform
 import random
 import asyncio
 import sys
-import argparse
+#import argparse
+import os
 
 # SET VARS
-parser = argparse.ArgumentParser()
-parser.add_argument("--prefix", help="Command Prefix")
-parser.add_argument("--token", help="Discord Bot Token")
-parser.add_argument("--reddit_client_id", help="Reddit Client ID")
-parser.add_argument("--reddit_client_secret", help="Reddit Client Secret")
-parser.add_argument("--reddit_client_useragent", help="Reddit Client User-Agent")
-args = parser.parse_args()
+#parser = argparse.ArgumentParser()
+#parser.add_argument("--prefix", help="Command Prefix")
+#parser.add_argument("--token", help="Discord Bot Token")
+#parser.add_argument("--reddit_client_id", help="Reddit Client ID")
+#parser.add_argument("--reddit_client_secret", help="Reddit Client Secret")
+#parser.add_argument("--reddit_client_useragent", help="Reddit Client User-Agent")
+#args = parser.parse_args()
+#
+#if args.prefix:
+#    prefix = args.prefix
+#
+#if args.token:
+#    token = args.token
+#
+#if args.reddit_client_id:
+#    reddit_client_id = args.reddit_client_id
+#
+#if args.reddit_client_secret:
+#    reddit_client_secret = args.reddit_client_secret
+#
+#if args.reddit_client_useragent:
+#    reddit_client_useragent = args.reddit_client_useragent
 
-if args.prefix:
-    prefix = args.prefix
-
-if args.token:
-    token = args.token
-
-if args.reddit_client_id:
-    reddit_client_id = args.reddit_client_id
-
-if args.reddit_client_secret:
-    reddit_client_secret = args.reddit_client_secret
-
-if args.reddit_client_useragent:
-    reddit_client_useragent = args.reddit_client_useragent
+prefix = os.environ['PREFIX']
+token = os.environ['TOKEN']
+reddit_client_id = os.environ['REDDIT_CLIENT_ID']
+reddit_client_secret = os.environ['REDDIT_CLIENT_SECRET']
+reddit_client_useragent = os.environ['REDDIT_CLIENT_USERAGENT']
 
 avatar = "https://i.redd.it/0uajctrps9u41.jpg"
 

requirements.txt

@@ -1,5 +1,4 @@
 discord.py[voice]
 youtube-dl
-pyyaml
 praw
 argparse