marcothms/aquabot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken ENV vars

Browse Source
This commit is contained in:
Marco Thomas
2020-08-31 17:49:52 +02:00
parent 3a3b7400bb
commit a66a051578
6 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.dockerignore
View File

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

1
.gitignore vendored
View File

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

12
Dockerfile
View File

@@ -4,12 +4,12 @@ WORKDIR /data
COPY . /data COPY . /data
ENV PREFIX ENV PREFIX /data
ENV TOKEN ENV TOKEN /data
ENV REDDIT_CLIENT_ID ENV REDDIT_CLIENT_ID /data
ENV REDDIT_CLIENT_SECRET ENV REDDIT_CLIENT_SECRET /data
ENV REDDIT_CLIENT_USERAGENT ENV REDDIT_CLIENT_USERAGENT /data
RUN python3 -m pip install -r requirements.txt 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

51
aquabot.py
View File

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

0
logs/.gitkeep Normal file
View File

1
requirements.txt
View File

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