diff --git a/app/backend/Dockerfile.prod b/app/backend/Dockerfile.prod index c58f66a..0d69af0 100644 --- a/app/backend/Dockerfile.prod +++ b/app/backend/Dockerfile.prod @@ -20,8 +20,7 @@ RUN apt-get update \ # install python dependencies RUN pip install --upgrade pip setuptools wheel -i https://pypi.tuna.tsinghua.edu.cn/simple -RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -i https://pypi.tuna.tsinghua.edu.cn/simple pipenv -RUN pip install --no-cache-dir --find-links=/usr/src/app/wheels pipenv +RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple pipenv COPY ./Pipfile . RUN pipenv install --deploy --dev @@ -64,11 +63,10 @@ RUN apt-get update \ && apt-get clean # install python dependencies -COPY --from=builder /usr/src/app/wheels /wheels COPY --from=builder /usr/src/app/Pipfile . RUN pip install --upgrade pip setuptools wheel -i https://pypi.tuna.tsinghua.edu.cn/simple -RUN pip install --no-cache /wheels/* -# RUN pipenv install --deploy --dev +RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple pipenv +RUN pipenv install --deploy --dev RUN pipenv run pip install "uvicorn[standard]==0.26.0" # add app diff --git a/app/backend/main.py b/app/backend/main.py index 3525d91..7ec349d 100644 --- a/app/backend/main.py +++ b/app/backend/main.py @@ -33,4 +33,4 @@ app.add_middleware( if __name__ == "__main__": - uvicorn.run("main:app", host="0.0.0.0", port=3100, reload=True) \ No newline at end of file + uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True) \ No newline at end of file diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 2246116..b378631 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -7,20 +7,20 @@ 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: + - "8000:8000" + environment: + - ENVIRONMENT=dev + - TESTING=0 frontend: build: diff --git a/app/frontend/src/App.tsx b/app/frontend/src/App.tsx index 662b0c4..5512af7 100644 --- a/app/frontend/src/App.tsx +++ b/app/frontend/src/App.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect, useRef } from 'react'; -const BASE_DOMAIN_NAME = process.env.REACT_APP_DOMAIN_NAME || 'localhost'; +const BASE_DOMAIN_NAME = import.meta.env.REACT_APP_DOMAIN_NAME || 'localhost'; interface Message {