From bee6e96d537a4dea410d9fb0c0c4a1bd2143f47c Mon Sep 17 00:00:00 2001 From: Ryana May Que Date: Fri, 6 Sep 2024 10:45:54 +0800 Subject: [PATCH] fix: improper docker setup --- Dockerfile | 12 +++++------- docker-compose.yml | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4922db9..2b84af1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,10 @@ # base layer FROM python:3.12-alpine as base -ARG DEV=false +ENV VIRTUAL_ENV=/sparkle/.venv \ + PATH="/sparkle/.venv/bin:$PATH" -ENV VIRTUAL_ENV=/app/.venv \ - PATH="/app/.venv/bin:$PATH" +RUN python -m venv $VIRTUAL_ENV RUN apk update && \ apk add libpq @@ -26,7 +26,7 @@ RUN pip install poetry==1.8.3 # Install the app COPY pyproject.toml poetry.lock ./ -RUN poetry install dev --no-root && rm -rf $POETRY_CACHE_DIR; +RUN poetry install --no-root && rm -rf $POETRY_CACHE_DIR; FROM base as runtime @@ -34,7 +34,5 @@ COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV} COPY app ./app -WORKDIR /sparkle/app - -CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] +CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] diff --git a/docker-compose.yml b/docker-compose.yml index ed01018..abc816e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ services: sparkle: container_name: sparkle - image: sparkle:lastest build: context: . dockerfile: Dockerfile