diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 2c4cdf0..f2669d0 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -72,12 +72,14 @@ jobs: -e TESTING=0 \ -p 8004:8765 \ ${{ env.IMAGE }}:latest - - name: Pytest - run: docker exec backend pipenv run python -m pytest . + # - 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 # 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/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 diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 4b934ff..2246116 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: # streamlit: # build: ./streamlit @@ -9,32 +7,31 @@ 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 + # 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: build: context: ./frontend dockerfile: Dockerfile.local container_name: frontend - platform: linux/amd64 volumes: - ./frontend:/usr/src/app ports: - "3004:5173" - depends_on: - - backend + # depends_on: + # - backend environment: LOG_LEVEL: "DEBUG"