From 226b1c75e529a5f3db048598810d0806625ee28f Mon Sep 17 00:00:00 2001 From: apogiatzis Date: Fri, 22 Nov 2024 00:33:23 +0000 Subject: [PATCH] fix: one more time --- .github/workflows/push_image_deploy.yml | 6 +++--- docker-compose.yml | 4 +--- ovisbot/extensions/ctf/ctf.py | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/push_image_deploy.yml b/.github/workflows/push_image_deploy.yml index 706b7b5..3b1e2d7 100644 --- a/.github/workflows/push_image_deploy.yml +++ b/.github/workflows/push_image_deploy.yml @@ -58,9 +58,9 @@ jobs: runAfterDeployment: | cd ~/ovisbot if [ -f docker-compose.yml ]; then - docker compose -f docker-compose.yml -f docker-compose.prod.yml down || true - docker compose -f docker-compose.yml -f docker-compose.prod.yml pull - docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d + docker-compose -f docker-compose.yml -f docker-compose.prod.yml down || true + docker-compose -f docker-compose.yml -f docker-compose.prod.yml pull + docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d else echo "docker-compose.yml not found in the repository!" exit 1 diff --git a/docker-compose.yml b/docker-compose.yml index 8b2aaa7..55fc5d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,7 @@ services: links: - mongo mongo: - image: mongo - ports: - - '27017:27017' + image: mongo:6 restart: always volumes: - db-data:/data/db diff --git a/ovisbot/extensions/ctf/ctf.py b/ovisbot/extensions/ctf/ctf.py index 3fc3c6d..b3179e1 100644 --- a/ovisbot/extensions/ctf/ctf.py +++ b/ovisbot/extensions/ctf/ctf.py @@ -400,7 +400,7 @@ async def finish_error(self, ctx, error): @ctf.command() async def solve(self, ctx): """ - Marks the current challenge as solved by you. + Marks the current challenge as solved by you. Addition of team mates that helped to solve is optional """ chall_name = get_chall_name(ctx) @@ -454,8 +454,7 @@ async def solve(self, ctx): ctx.channel.category.channels, name="general" ) await general_channel.send( - f"{solvers_str} solved the {chall_name} challenge! { - reward_emoji} {reward_emoji}" + f"{solvers_str} solved the {chall_name} challenge! {reward_emoji} {reward_emoji}" ) @solve.error