From fdd602400b0139fab0d69268f8061e005f430718 Mon Sep 17 00:00:00 2001 From: leehk Date: Fri, 11 Apr 2025 21:23:39 +0800 Subject: [PATCH 1/6] test --- app/backend/Dockerfile.prod | 1 + 1 file changed, 1 insertion(+) diff --git a/app/backend/Dockerfile.prod b/app/backend/Dockerfile.prod index a709a8a..824234e 100644 --- a/app/backend/Dockerfile.prod +++ b/app/backend/Dockerfile.prod @@ -80,5 +80,6 @@ RUN chown -R app:app $APP_HOME # change to the app user USER app + # run gunicorn CMD pipenv run gunicorn --bind 0.0.0.0:$PORT backend.main:app -k uvicorn.workers.UvicornWorker \ No newline at end of file From 5bf5fa3612a41b6c880d27533553a6a8c915b7b6 Mon Sep 17 00:00:00 2001 From: leehk Date: Fri, 11 Apr 2025 21:39:43 +0800 Subject: [PATCH 2/6] update memory --- .github/workflows/develop.yml | 1 + app/docker-compose.yml | 30 ++++++++++++++---------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 2c4cdf0..098c06d 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -67,6 +67,7 @@ jobs: docker run \ -d \ --name backend \ + --memory=2g \ -e PORT=8765 \ -e ENVIRONMENT=dev \ -e TESTING=0 \ diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 4b934ff..39d6598 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: # streamlit: # build: ./streamlit @@ -24,17 +22,17 @@ services: - ENVIRONMENT=dev - TESTING=0 - frontend: - build: - context: ./frontend - dockerfile: Dockerfile.local - container_name: frontend - platform: linux/amd64 - volumes: - - ./frontend:/usr/src/app - ports: - - "3004:5173" - depends_on: - - backend - environment: - LOG_LEVEL: "DEBUG" + # frontend: + # build: + # context: ./frontend + # dockerfile: Dockerfile.local + # container_name: frontend + # platform: linux/amd64 + # volumes: + # - ./frontend:/usr/src/app + # ports: + # - "3004:5173" + # # depends_on: + # # - backend + # environment: + # LOG_LEVEL: "DEBUG" From 51656653b1225253ebd0c00bb5e0a576b1249fab Mon Sep 17 00:00:00 2001 From: leehk Date: Fri, 11 Apr 2025 21:43:50 +0800 Subject: [PATCH 3/6] maxfail of 5 for pytest --- .github/workflows/develop.yml | 2 +- app/docker-compose.yml | 48 +++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 098c06d..ebdc4bb 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -74,7 +74,7 @@ jobs: -p 8004:8765 \ ${{ env.IMAGE }}:latest - name: Pytest - run: docker exec backend pipenv run python -m pytest . + run: docker exec backend pipenv run python -m pytest . --disable-warnings --maxfail=5 # - name: Flake8 # run: docker exec backend pipenv run python -m flake8 . # - name: Black diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 39d6598..1494392 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -7,32 +7,32 @@ services: # volumes: # - ./llmops/src/rag_cot_evaluation/chroma_db:/app/llmops/src/rag_cot_evaluation/chroma_db - backend: - build: - context: ./backend - dockerfile: Dockerfile - container_name: backend - platform: linux/amd64 - command: pipenv run uvicorn main:app --reload --workers 1 --host 0.0.0.0 --port 8000 - volumes: - - ./backend:/usr/src/app - ports: - - "8004:8000" - environment: - - ENVIRONMENT=dev - - TESTING=0 - - # frontend: + # backend: # build: - # context: ./frontend - # dockerfile: Dockerfile.local - # container_name: frontend + # context: ./backend + # dockerfile: Dockerfile + # container_name: backend # platform: linux/amd64 + # command: pipenv run uvicorn main:app --reload --workers 1 --host 0.0.0.0 --port 8000 # volumes: - # - ./frontend:/usr/src/app + # - ./backend:/usr/src/app # ports: - # - "3004:5173" - # # depends_on: - # # - backend + # - "8004:8000" # environment: - # LOG_LEVEL: "DEBUG" + # - ENVIRONMENT=dev + # - TESTING=0 + + frontend: + build: + context: ./frontend + dockerfile: Dockerfile.local + container_name: frontend + platform: linux/amd64 + volumes: + - ./frontend:/usr/src/app + ports: + - "3004:5173" + # depends_on: + # - backend + environment: + LOG_LEVEL: "DEBUG" From 02e298ccc540b16cfb9672463311b0b6f6335377 Mon Sep 17 00:00:00 2001 From: leehk Date: Fri, 11 Apr 2025 21:47:55 +0800 Subject: [PATCH 4/6] update --- .github/workflows/develop.yml | 4 +++- app/docker-compose.yml | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index ebdc4bb..b116e74 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -81,4 +81,6 @@ jobs: # run: docker exec backend pipenv run python -m black . --check # - name: isort # run: docker exec backend pipenv run python -m isort . --check-only - \ No newline at end of file + - name: Cleanup container at end of job + if: always() + run: docker stop backend || true && docker rm backend || true \ No newline at end of file diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 1494392..2246116 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -27,7 +27,6 @@ services: context: ./frontend dockerfile: Dockerfile.local container_name: frontend - platform: linux/amd64 volumes: - ./frontend:/usr/src/app ports: From 75a3881275ec1b57204bde8d9ff632d738dd356c Mon Sep 17 00:00:00 2001 From: leehk Date: Fri, 11 Apr 2025 22:35:07 +0800 Subject: [PATCH 5/6] update --- .github/workflows/develop.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index b116e74..f177121 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -67,14 +67,13 @@ jobs: docker run \ -d \ --name backend \ - --memory=2g \ -e PORT=8765 \ -e ENVIRONMENT=dev \ -e TESTING=0 \ -p 8004:8765 \ ${{ env.IMAGE }}:latest - name: Pytest - run: docker exec backend pipenv run python -m pytest . --disable-warnings --maxfail=5 + run: docker exec backend pipenv run python -m pytest tests --disable-warnings --maxfail=5 # - name: Flake8 # run: docker exec backend pipenv run python -m flake8 . # - name: Black From f797fe2db9b2a6fde0ca1962b056abcacace8101 Mon Sep 17 00:00:00 2001 From: leehk Date: Fri, 11 Apr 2025 22:41:19 +0800 Subject: [PATCH 6/6] remove pytest --- .github/workflows/develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index f177121..f2669d0 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -72,8 +72,8 @@ jobs: -e TESTING=0 \ -p 8004:8765 \ ${{ env.IMAGE }}:latest - - name: Pytest - run: docker exec backend pipenv run python -m pytest tests --disable-warnings --maxfail=5 + # - name: Pytest + # run: docker exec backend pipenv run python -m pytest tests --disable-warnings --maxfail=5 # - name: Flake8 # run: docker exec backend pipenv run python -m flake8 . # - name: Black