From 9b50612f19e4e1f6b701289dc26edc80a3442ad6 Mon Sep 17 00:00:00 2001 From: Alex Orid Date: Thu, 22 Apr 2021 15:15:11 -0400 Subject: [PATCH] Docker Improvements & Simplification --- Dockerfile_standalone_DiscordScript | 7 ++++--- Dockerfile_standalone_TwitchScript | 7 ++++--- Dockerfile_standalone_command | 7 ++++--- README.md | 4 ++-- docker-compose.yaml | 4 ++-- makedockerimages.bat | 3 +++ requirements_sa_command.txt | 7 +++++++ requirements_sa_discord.txt | 4 ++++ requirements_sa_twitch.txt | 4 ++++ standalone_twitch_pubsub.py | 24 ++++++++++++++++++++++++ 10 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 makedockerimages.bat create mode 100644 requirements_sa_command.txt create mode 100644 requirements_sa_discord.txt create mode 100644 requirements_sa_twitch.txt create mode 100644 standalone_twitch_pubsub.py diff --git a/Dockerfile_standalone_DiscordScript b/Dockerfile_standalone_DiscordScript index 79b38c2..d52daec 100644 --- a/Dockerfile_standalone_DiscordScript +++ b/Dockerfile_standalone_DiscordScript @@ -1,9 +1,10 @@ -FROM python:3.8-buster +FROM python:3.10.0a7-alpine3.13 WORKDIR /Praxis -COPY requirements.txt requirements.txt -RUN pip3 install -r requirements.txt +COPY requirements_sa_discord.txt requirements_sa_discord.txt +RUN apk add --update gcc libc-dev linux-headers && rm -rf /var/cache/apk/* +RUN pip3 install -r requirements_sa_discord.txt COPY . . diff --git a/Dockerfile_standalone_TwitchScript b/Dockerfile_standalone_TwitchScript index fdda522..d73b25e 100644 --- a/Dockerfile_standalone_TwitchScript +++ b/Dockerfile_standalone_TwitchScript @@ -1,9 +1,10 @@ -FROM python:3.8-buster +FROM python:3.10.0a7-alpine3.13 WORKDIR /Praxis -COPY requirements.txt requirements.txt -RUN pip3 install -r requirements.txt +COPY requirements_sa_twitch.txt requirements_sa_twitch.txt +RUN apk add --update gcc libc-dev linux-headers && rm -rf /var/cache/apk/* +RUN pip3 install -r requirements_sa_twitch.txt COPY . . diff --git a/Dockerfile_standalone_command b/Dockerfile_standalone_command index c0e9965..2d131c3 100644 --- a/Dockerfile_standalone_command +++ b/Dockerfile_standalone_command @@ -1,9 +1,10 @@ -FROM python:3.8-buster +FROM python:3.10.0a7-alpine3.13 WORKDIR /Praxis -COPY requirements.txt requirements.txt -RUN pip3 install -r requirements.txt +COPY requirements_sa_command.txt requirements_sa_command.txt +RUN apk add --update gcc libc-dev linux-headers && rm -rf /var/cache/apk/* +RUN pip3 install -r requirements_sa_command.txt COPY . . diff --git a/README.md b/README.md index e3541c5..88f04e2 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ Run the following to enable these V2 modules without Docker. (After you install Use these commands to build the images.
`docker build --file Dockerfile_standalone_command --tag standalone_command .`
-`docker build --file Dockerfile_standalone_TwitchScript --tag twitchscript_standalone .`
-`docker build --file Dockerfile_standalone_DiscordScript --tag discordscript_standalone .`
+`docker build --file Dockerfile_standalone_TwitchScript --tag standalone_twitchscript .`
+`docker build --file Dockerfile_standalone_DiscordScript --tag standalone_discordscript .`
### Docker-Compose Info: diff --git a/docker-compose.yaml b/docker-compose.yaml index 02d31c4..5904909 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,10 +7,10 @@ services: environment: - ISDOCKER=cat twitchscript_standalone: - image: twitchscript_standalone + image: standalone_twitchscript environment: - ISDOCKER=cat discordscript_standalone: - image: discordscript_standalone + image: standalone_discordscript environment: - ISDOCKER=cat \ No newline at end of file diff --git a/makedockerimages.bat b/makedockerimages.bat new file mode 100644 index 0000000..56ff1b5 --- /dev/null +++ b/makedockerimages.bat @@ -0,0 +1,3 @@ +docker build --file Dockerfile_standalone_command --tag standalone_command . +docker build --file Dockerfile_standalone_DiscordScript --tag standalone_discordscript . +docker build --file Dockerfile_standalone_TwitchScript --tag standalone_twitchscript . \ No newline at end of file diff --git a/requirements_sa_command.txt b/requirements_sa_command.txt new file mode 100644 index 0000000..8f21948 --- /dev/null +++ b/requirements_sa_command.txt @@ -0,0 +1,7 @@ +twitch-python +discord.py +flask +psutil +phue +art +requests \ No newline at end of file diff --git a/requirements_sa_discord.txt b/requirements_sa_discord.txt new file mode 100644 index 0000000..336caf8 --- /dev/null +++ b/requirements_sa_discord.txt @@ -0,0 +1,4 @@ +discord.py +psutil +art +requests \ No newline at end of file diff --git a/requirements_sa_twitch.txt b/requirements_sa_twitch.txt new file mode 100644 index 0000000..a1dcd13 --- /dev/null +++ b/requirements_sa_twitch.txt @@ -0,0 +1,4 @@ +twitch-python +psutil +art +requests \ No newline at end of file diff --git a/standalone_twitch_pubsub.py b/standalone_twitch_pubsub.py new file mode 100644 index 0000000..9241aab --- /dev/null +++ b/standalone_twitch_pubsub.py @@ -0,0 +1,24 @@ +import credentials + +import config +import utilities_script as utility + +class Twitch_Pubsub(): + def __init__(self): + super().__init__() + self.twitchCredential: credentials.Twitch_Credential + + def main(): + pass + + +if __name__ == "__main__": + testModule = Twitch_Pubsub() + + credentials_manager = credentials.Credentials_Module() + credentials_manager.load_credentials() + testModule.twitchCredential = credentials_manager.find_Twitch_Credential(config.credentialsNickname) + #testModule.dbCredential = credentials_manager.find_DB_Credential(config.credentialsNickname) + + for twitchChannel in config.autoJoin_TwitchChannels: + testModule.join_channel(None, twitchChannel) \ No newline at end of file