From 9342129056e94cf8f6ee300606d13fafc0c53588 Mon Sep 17 00:00:00 2001 From: balajisa Date: Sat, 28 Sep 2024 11:00:08 +0000 Subject: [PATCH 1/4] chore: fix dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 04067a2..790b742 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ COPY . /app/app-catalog RUN pip3 install -r app-catalog/requirements.txt -CMD ["python", "-u", "/app/app-catalog/main.py"] \ No newline at end of file +CMD ["python", "-u", "/app/app-catalog/app/main.py"] \ No newline at end of file From cadf572ad1fb59e29039b277866c324f93ada487 Mon Sep 17 00:00:00 2001 From: balajisa Date: Sat, 28 Sep 2024 11:15:15 +0000 Subject: [PATCH 2/4] chore: fix dockerfile --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 49624b6..bfd95b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ fastapi==0.112.2 kubernetes==30.1.0 pytest==8.3.3 +uvicorn==0.30.6 glueops-helpers @ https://github.com/GlueOps/python-glueops-helpers-library/archive/refs/tags/v0.4.1.zip \ No newline at end of file From 2f694ce93650449022360d9f05a71bc7e4794bb3 Mon Sep 17 00:00:00 2001 From: balajisa Date: Sun, 29 Sep 2024 08:25:59 +0000 Subject: [PATCH 3/4] chore: fix app port --- app/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index 2a7840c..598b472 100644 --- a/app/main.py +++ b/app/main.py @@ -101,5 +101,5 @@ def get_apps(): return Response(content=json.dumps({"error": str(e)}), status_code=500) if __name__ == "__main__": - uvicorn.run(app, host="0.0.0.0") + uvicorn.run(app, host="0.0.0.0", port=8080) From 066b6a82affa0a88d63cf391bfc073968498bf84 Mon Sep 17 00:00:00 2001 From: balajisa Date: Sun, 13 Oct 2024 11:45:22 +0000 Subject: [PATCH 4/4] chore: append https to app_link --- app/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index 598b472..9d556bd 100644 --- a/app/main.py +++ b/app/main.py @@ -76,7 +76,7 @@ def parse_app_data(app): "app_name": app_name, "argocd_status": app["status"]["health"]["status"], "last_updated_at": app["status"]["operationState"]["finishedAt"], - "app_link": f"argocd.{captain_domain}/applications/{namespace}/{app_name}", + "app_link": f"https://argocd.{captain_domain}/applications/{namespace}/{app_name}", } if "externalURLs" in app["status"].get("summary", {}): res_app["external_urls"] = app["status"]["summary"]["externalURLs"]