diff --git a/gitea/gitea-data/gitea/queues/common/LOG b/gitea/gitea-data/gitea/queues/common/LOG index 092f342..b8d6d23 100644 --- a/gitea/gitea-data/gitea/queues/common/LOG +++ b/gitea/gitea-data/gitea/queues/common/LOG @@ -496,6 +496,7 @@ 15:41:07.579359 version@stat F·[0 1] S·577B[0B 577B] Sc·[0.00 0.00] 15:41:07.617133 db@janitor F·3 G·0 15:41:07.617309 db@open done T·42.89556ms +<<<<<<< HEAD =============== Feb 8, 2026 (UTC) =============== 13:10:57.397891 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed 13:10:57.432913 version@stat F·[0 1] S·577B[0B 577B] Sc·[0.00 0.00] @@ -505,3 +506,5 @@ 13:10:57.440763 version@stat F·[0 1] S·577B[0B 577B] Sc·[0.00 0.00] 13:10:57.485091 db@janitor F·3 G·0 13:10:57.485346 db@open done T·49.7959ms +======= +>>>>>>> 7377c00 (aa) diff --git a/src/app/Dockerfile b/src/app/Dockerfile index aa0a7c5..f83bcac 100644 --- a/src/app/Dockerfile +++ b/src/app/Dockerfile @@ -22,7 +22,7 @@ COPY --from=base /venv /venv ENV PATH="/venv/bin:$PATH" COPY src/app /app -COPY TpDevOpsProject.md /app/TpDevOpsProject.md +COPY readme.md /app/readme.md RUN useradd -m -u 1000 devopsuser && chown -R devopsuser:devopsuser /app USER devopsuser diff --git a/src/app/main.py b/src/app/main.py index 38f8b0d..142c1cb 100644 --- a/src/app/main.py +++ b/src/app/main.py @@ -42,7 +42,7 @@ async def monitor_requests(request: Request, call_next): @app.get("/", response_class=HTMLResponse) async def home(request: Request): - md_file_path = "/app/TpDevOpsProject.md" + md_file_path = "/app/readme.md" try: with open(md_file_path, "r", encoding="utf-8") as f: md_content = f.read()