Improved docker compose #70-1

2022-10-20 15:45:52 +02:00 · 2022-10-20 15:45:52 +02:00 · d0d053152d
commit d0d053152d
parent 8231d20e3b
17 changed files with 147 additions and 60 deletions
--- 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
+      - kdb_db_1:/var/lib/mysql
--- 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": {
--- 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": {
--- 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')
--- 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')
--- 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')
--- 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')
--- 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')
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {
--- 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": {