From d0d053152d783555a30c62fbafa3b3183aa3fa77 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 20 Oct 2022 15:45:52 +0200 Subject: [PATCH] Improved docker compose #70-1 --- kdb-bot/docker-compose.yml | 34 ++++--------------- kdb-bot/src/bot/bot.json | 4 +-- kdb-bot/src/bot_api/bot-api.json | 4 +-- .../bot_api/controller/discord/__init__.py | 26 ++++++++++++++ kdb-bot/src/bot_api/event/__init__.py | 26 ++++++++++++++ .../src/bot_api/filter/discord/__init__.py | 26 ++++++++++++++ kdb-bot/src/bot_api/mail/__init__.py | 25 ++++++++++++++ kdb-bot/src/bot_api/model/discord/__init__.py | 26 ++++++++++++++ kdb-bot/src/bot_core/bot-core.json | 4 +-- kdb-bot/src/bot_data/bot-data.json | 4 +-- kdb-bot/src/modules/admin/admin.json | 4 +-- kdb-bot/src/modules/auto_role/auto-role.json | 4 +-- kdb-bot/src/modules/base/base.json | 4 +-- kdb-bot/src/modules/boot_log/boot-log.json | 4 +-- kdb-bot/src/modules/database/database.json | 4 +-- kdb-bot/src/modules/moderator/moderator.json | 4 +-- .../src/modules/permission/permission.json | 4 +-- 17 files changed, 147 insertions(+), 60 deletions(-) diff --git a/kdb-bot/docker-compose.yml b/kdb-bot/docker-compose.yml index bf10c027..2dc48342 100644 --- a/kdb-bot/docker-compose.yml +++ b/kdb-bot/docker-compose.yml @@ -2,13 +2,12 @@ version: "3.9" volumes: kdb_prod_1: - kdb_staging_1: + kdb_web_prod_1: kdb_db_1: - kdb_db_2: services: kdb_prod_1: - image: kdb/kdb:0.2.1 + image: kdb/kdb:0.3 container_name: kdb_prod_1 depends_on: - kdb_db_1 @@ -20,17 +19,13 @@ services: KDB_PREFIX: "!k " restart: 'no' - kdb_staging_1: - image: kdb/kdb:0.2.1 - container_name: kdb_staging_1 + kdb_web_prod_1: + image: kdb/kdb-web:0.3 + container_name: kdb_web_prod_1 depends_on: - kdb_db_1 volumes: - - kdb_staging_1:/app - environment: - KDB_ENVIRONMENT: "staging" - KDB_TOKEN: "" - KDB_PREFIX: "!kt " + - kdb_web_prod_1:/app restart: 'no' kdb_db_1: @@ -46,19 +41,4 @@ services: ports: - "3307:3306" volumes: - - kdb_db_1:/var/lib/mysql - - kdb_db_2: - image: mysql:latest - container_name: kdb_db_2 - command: mysqld --default-authentication-plugin=mysql_native_password - restart: unless-stopped - environment: - MYSQL_ROOT_PASSWORD: "kd_kdb" - MYSQL_USER: "kd_kdb" - MYSQL_PASSWORD: "kd_kdb" - MYSQL_DATABASE: "kd_kdb" - ports: - - "3308:3306" - volumes: - - kdb_db_2:/var/lib/mysql \ No newline at end of file + - kdb_db_1:/var/lib/mysql \ No newline at end of file diff --git a/kdb-bot/src/bot/bot.json b/kdb-bot/src/bot/bot.json index 8fd900ca..dcd4efc0 100644 --- a/kdb-bot/src/bot/bot.json +++ b/kdb-bot/src/bot/bot.json @@ -33,9 +33,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/bot_api/bot-api.json b/kdb-bot/src/bot_api/bot-api.json index 86b1012e..85c41d72 100644 --- a/kdb-bot/src/bot_api/bot-api.json +++ b/kdb-bot/src/bot_api/bot-api.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/bot_api/controller/discord/__init__.py b/kdb-bot/src/bot_api/controller/discord/__init__.py index e69de29b..48cb2fcc 100644 --- a/kdb-bot/src/bot_api/controller/discord/__init__.py +++ b/kdb-bot/src/bot_api/controller/discord/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +""" +bot Keksdose bot +~~~~~~~~~~~~~~~~~~~ + +Discord bot for the Keksdose discord Server + +:copyright: (c) 2022 sh-edraft.de +:license: MIT, see LICENSE for more details. + +""" + +__title__ = 'bot_api.controller.discord' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 sh-edraft.de' +__version__ = '0.3.0' + +from collections import namedtuple + + +# imports: + +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='0', minor='3', micro='0') diff --git a/kdb-bot/src/bot_api/event/__init__.py b/kdb-bot/src/bot_api/event/__init__.py index e69de29b..0627d7cf 100644 --- a/kdb-bot/src/bot_api/event/__init__.py +++ b/kdb-bot/src/bot_api/event/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +""" +bot Keksdose bot +~~~~~~~~~~~~~~~~~~~ + +Discord bot for the Keksdose discord Server + +:copyright: (c) 2022 sh-edraft.de +:license: MIT, see LICENSE for more details. + +""" + +__title__ = 'bot_api.event' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 sh-edraft.de' +__version__ = '0.3.0' + +from collections import namedtuple + + +# imports: + +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='0', minor='3', micro='0') diff --git a/kdb-bot/src/bot_api/filter/discord/__init__.py b/kdb-bot/src/bot_api/filter/discord/__init__.py index e69de29b..1f6d5f55 100644 --- a/kdb-bot/src/bot_api/filter/discord/__init__.py +++ b/kdb-bot/src/bot_api/filter/discord/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +""" +bot Keksdose bot +~~~~~~~~~~~~~~~~~~~ + +Discord bot for the Keksdose discord Server + +:copyright: (c) 2022 sh-edraft.de +:license: MIT, see LICENSE for more details. + +""" + +__title__ = 'bot_api.filter.discord' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 sh-edraft.de' +__version__ = '0.3.0' + +from collections import namedtuple + + +# imports: + +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='0', minor='3', micro='0') diff --git a/kdb-bot/src/bot_api/mail/__init__.py b/kdb-bot/src/bot_api/mail/__init__.py index 425ab6c1..4f792fb4 100644 --- a/kdb-bot/src/bot_api/mail/__init__.py +++ b/kdb-bot/src/bot_api/mail/__init__.py @@ -1 +1,26 @@ +# -*- coding: utf-8 -*- + +""" +bot Keksdose bot +~~~~~~~~~~~~~~~~~~~ + +Discord bot for the Keksdose discord Server + +:copyright: (c) 2022 sh-edraft.de +:license: MIT, see LICENSE for more details. + +""" + +__title__ = 'bot_api.mail' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 sh-edraft.de' +__version__ = '0.3.0' + +from collections import namedtuple + + # imports + +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='0', minor='3', micro='0') diff --git a/kdb-bot/src/bot_api/model/discord/__init__.py b/kdb-bot/src/bot_api/model/discord/__init__.py index e69de29b..a7bbccf9 100644 --- a/kdb-bot/src/bot_api/model/discord/__init__.py +++ b/kdb-bot/src/bot_api/model/discord/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +""" +bot Keksdose bot +~~~~~~~~~~~~~~~~~~~ + +Discord bot for the Keksdose discord Server + +:copyright: (c) 2022 sh-edraft.de +:license: MIT, see LICENSE for more details. + +""" + +__title__ = 'bot_api.model.discord' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 sh-edraft.de' +__version__ = '0.3.0' + +from collections import namedtuple + + +# imports: + +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='0', minor='3', micro='0') diff --git a/kdb-bot/src/bot_core/bot-core.json b/kdb-bot/src/bot_core/bot-core.json index 502ce6c6..5d1641db 100644 --- a/kdb-bot/src/bot_core/bot-core.json +++ b/kdb-bot/src/bot_core/bot-core.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/bot_data/bot-data.json b/kdb-bot/src/bot_data/bot-data.json index 99af9f44..3177e285 100644 --- a/kdb-bot/src/bot_data/bot-data.json +++ b/kdb-bot/src/bot_data/bot-data.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/modules/admin/admin.json b/kdb-bot/src/modules/admin/admin.json index e76e9180..d2f28ae9 100644 --- a/kdb-bot/src/modules/admin/admin.json +++ b/kdb-bot/src/modules/admin/admin.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/modules/auto_role/auto-role.json b/kdb-bot/src/modules/auto_role/auto-role.json index f8756155..82786e1d 100644 --- a/kdb-bot/src/modules/auto_role/auto-role.json +++ b/kdb-bot/src/modules/auto_role/auto-role.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/modules/base/base.json b/kdb-bot/src/modules/base/base.json index a77d7c5b..8ce9ff81 100644 --- a/kdb-bot/src/modules/base/base.json +++ b/kdb-bot/src/modules/base/base.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/modules/boot_log/boot-log.json b/kdb-bot/src/modules/boot_log/boot-log.json index 0090d83c..6ce52ac2 100644 --- a/kdb-bot/src/modules/boot_log/boot-log.json +++ b/kdb-bot/src/modules/boot_log/boot-log.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/modules/database/database.json b/kdb-bot/src/modules/database/database.json index c4b05683..2954470f 100644 --- a/kdb-bot/src/modules/database/database.json +++ b/kdb-bot/src/modules/database/database.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/modules/moderator/moderator.json b/kdb-bot/src/modules/moderator/moderator.json index 034735a6..5f9cfa6d 100644 --- a/kdb-bot/src/modules/moderator/moderator.json +++ b/kdb-bot/src/modules/moderator/moderator.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": { diff --git a/kdb-bot/src/modules/permission/permission.json b/kdb-bot/src/modules/permission/permission.json index 86cbc3c7..ef88127a 100644 --- a/kdb-bot/src/modules/permission/permission.json +++ b/kdb-bot/src/modules/permission/permission.json @@ -22,9 +22,7 @@ "cpl-cli==2022.10.0" ], "PythonVersion": ">=3.10.4", - "PythonPath": { - "linux": "" - }, + "PythonPath": {}, "Classifiers": [] }, "BuildSettings": {