From dbf1d8880d2ddbcd039d5a39be854e844ebaf845 Mon Sep 17 00:00:00 2001 From: Stepan Vladovskiy Date: Tue, 9 Apr 2024 15:11:17 -0300 Subject: [PATCH 1/3] feat: add healtcheck to ok in starlette app --- main.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/main.py b/main.py index 6bb3e1e..b07d970 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,8 @@ from os.path import exists from ariadne import load_schema_from_path, make_executable_schema from starlette.applications import Starlette +from starlette.routing import Route +from starlette.responses import JSONResponse from services.rediscache import redis from services.schema import resolvers @@ -22,6 +24,8 @@ async def start(): f.write(str(os.getpid())) print(f"[main] process started in {MODE} mode") +async def healthcheck(request): + return JSONResponse({"status": "ok"}) # main starlette app object with ariadne mounted in root app = Starlette( @@ -32,4 +36,7 @@ app = Starlette( ], on_shutdown=[redis.disconnect], debug=True, + routes=[ + Route('/', healthcheck, methods=['GET']), + ], ) From a774108b181881019faf327e4f2bf823e36bf58d Mon Sep 17 00:00:00 2001 From: Stepan Vladovskiy Date: Wed, 10 Apr 2024 10:18:52 -0300 Subject: [PATCH 2/3] feat: with Playground mounted on / --- main.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index b07d970..8e0923a 100644 --- a/main.py +++ b/main.py @@ -4,8 +4,9 @@ from os.path import exists from ariadne import load_schema_from_path, make_executable_schema from starlette.applications import Starlette +from ariadne.asgi import GraphQL + from starlette.routing import Route -from starlette.responses import JSONResponse from services.rediscache import redis from services.schema import resolvers @@ -24,9 +25,6 @@ async def start(): f.write(str(os.getpid())) print(f"[main] process started in {MODE} mode") -async def healthcheck(request): - return JSONResponse({"status": "ok"}) - # main starlette app object with ariadne mounted in root app = Starlette( on_startup=[ @@ -37,6 +35,6 @@ app = Starlette( on_shutdown=[redis.disconnect], debug=True, routes=[ - Route('/', healthcheck, methods=['GET']), + Route("/", GraphQL(schema, debug=True)), ], ) From d292be591ece81ade9608a5607c423e7bfe835d9 Mon Sep 17 00:00:00 2001 From: Stepan Vladovskiy Date: Thu, 11 Apr 2024 15:36:17 -0300 Subject: [PATCH 3/3] feat: add in CI main->v2 , dev->staging --- .gitea/workflows/main.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index bc01191..a58bb41 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -18,9 +18,18 @@ jobs: id: branch_name run: echo "::set-output name=branch::$(echo ${GITHUB_REF##*/})" - - name: Push to dokku + - name: Push to dokku for main branch + if: github.ref == 'refs/heads/main' uses: dokku/github-action@master with: branch: 'main' git_remote_url: 'ssh://dokku@v2.discours.io:22/inbox' + ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: Push to dokku for staging branch + if: github.ref == 'refs/heads/dev' + uses: dokku/github-action@master + with: + branch: 'main' + git_remote_url: 'ssh://dokku@staging.discours.io:22/inbox' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} \ No newline at end of file