Merge pull request 'dev' (#392 ) from dev into master

Reviewed-on: sh-edraft.de/kd_discord_bot#392
Merge branch 'master' into dev
2023-10-02 09:22:16 +02:00 · 2023-10-02 09:22:09 +02:00 · 2023-10-02 09:20:33 +02:00 · 2023-10-02 08:48:25 +02:00 · 2023-10-02 08:36:33 +02:00 · 2023-10-02 08:31:15 +02:00
3 changed files with 7 additions and 15 deletions
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -5,7 +5,8 @@ volumes:

 services:
  kdb_bot_staging_1:
-    image: sh-edraft.de/kdb-bot:1.1.8
+    image: sh-edraft.de/kdb-bot:1.1.9
+    restart: unless-stopped
    depends_on:
      - kdb_db_staging_1
    networks:
@@ -29,14 +30,9 @@ services:
        reservations:
          cpus: "0.5"
          memory: 1024M
-      restart_policy:
-        condition: on-failure
-        delay: 3s
-        max_attempts: 3
-        window: 60s

  kdb_web_staging_1:
-    image: sh-edraft.de/kdb-web:1.1.8
+    image: sh-edraft.de/kdb-web:1.1.9
    depends_on:
      - kdb_bot_staging_1
    networks:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,8 @@ volumes:

 services:
  kdb_bot_prod_1:
-    image: sh-edraft.de/kdb-bot:1.1.8
+    image: sh-edraft.de/kdb-bot:1.1.9
+    restart: unless-stopped
    depends_on:
      - kdb_db_prod_1
    networks:
@@ -28,14 +29,9 @@ services:
        reservations:
          cpus: "0.5"
          memory: 1024M
-      restart_policy:
-        condition: on-failure
-        delay: 3s
-        max_attempts: 3
-        window: 60s

  kdb_web_prod_1:
-    image: sh-edraft.de/kdb-web:1.1.8
+    image: sh-edraft.de/kdb-web:1.1.9
    depends_on:
      - kdb_bot_prod_1
    networks:
--- a/kdb-bot/src/modules/short_role_name/short_role_name_check_command.py
+++ b/kdb-bot/src/modules/short_role_name/short_role_name_check_command.py
@@ -48,7 +48,7 @@ class ShortRoleNameCheckCommand(DiscordCommandABC):
            return

        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{ctx.guild.id}")
-        if not FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum.game_server):
+        if not FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum.short_role_name):
            await self._message_service.send_ctx_msg(ctx, self._t.transform("common.feature_not_activated"))
            return
Author	SHA1	Message	Date
Sven Heidemann	aba6e48e2b	Merge pull request 'dev' (#392 ) from dev into master All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m42s Details Reviewed-on: sh-edraft.de/kd_discord_bot#392	2023-10-02 09:22:16 +02:00
Sven Heidemann	73848c3141	Merge branch 'master' into dev All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m22s Details	2023-10-02 09:22:09 +02:00
Sven Heidemann	33d6015088	Fixed compose Some checks reported warnings Deploy dev on push / on-push-deploy_sh-edraft (push) Has been cancelled Details	2023-10-02 09:20:33 +02:00
Sven Heidemann	7e962e05f6	Fixed docker stacks All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m16s Details	2023-10-02 08:48:25 +02:00
Sven Heidemann	c73c6876b2	Fixed short role name check command All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m49s Details	2023-10-02 08:36:33 +02:00
Sven Heidemann	8e949c3e1a	Set compose versions All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m18s Details	2023-10-02 08:31:15 +02:00
Sven Heidemann	0ed93c56d0	Merge pull request 'dev' (#389 ) from dev into master All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m31s Details Reviewed-on: sh-edraft.de/kd_discord_bot#389	2023-10-02 07:22:08 +02:00