From b86fc88adb73f5418c6e570ecaf26d03ec0948b0 Mon Sep 17 00:00:00 2001 From: Five Grant <5@fivegrant.com> Date: Fri, 25 Aug 2023 09:13:09 -0500 Subject: [PATCH] Include lib in both Dockerfiles (#20) --- api/Dockerfile | 5 +++-- pyproject.toml | 2 +- worker/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 3873964..0ecf4de 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -16,8 +16,9 @@ RUN poetry config virtualenvs.create false && \ poetry install --no-root --no-cache --with api COPY api ta1-service/api +COPY lib ta1-service/lib WORKDIR /ta1-service EXPOSE 8000 -ENV PYTHONPATH=/ta1-service/api -CMD [ "uvicorn", "server:app", "--reload", "--host", "0.0.0.0", "--port", "8000" ] +ENV PYTHONPATH=/ta1-service +CMD [ "uvicorn", "api.server:app", "--reload", "--host", "0.0.0.0", "--port", "8000" ] diff --git a/pyproject.toml b/pyproject.toml index de2d728..1513a77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ta1-service" -version = "0.1.0" +version = "1.6.0" description = "" authors = ["Powell Fendley"] readme = "README.md" diff --git a/worker/Dockerfile b/worker/Dockerfile index 562425b..2f45a14 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -19,5 +19,5 @@ ENV REDIS_HOST redis ENV REDIS_PORT 6379 COPY worker worker -WORKDIR /worker +COPY lib lib CMD rq worker --url redis://$REDIS_HOST:$REDIS_PORT high default low \ No newline at end of file