Merge pull request #13 from bescka/10-optimize-backend-dockerfile

Update backend Dockerfile.dev
bescka · Jul 29, 2024 · 907ab45 · 907ab45
2 parents c2faaf0 + 69717bd
commit 907ab45
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 22 deletions.
diff --git a/backend-app/Dockerfile.dev b/backend-app/Dockerfile.dev
@@ -1,13 +1,29 @@
-FROM python:3.12-slim
+FROM python:3.12-slim AS builder
 
 # Update and install dependencies
 RUN apt-get update \
+	&& apt install sqlite3 \
 	&& rm -rf /var/lib/apt/lists/*
 
+RUN pip install poetry==1.8.3
+
+ENV POETRY_NO_INTERACTION=1 \
+	POETRY_VIRTUALENVS_IN_PROJECT=1 \
+	POETRY_VIRTUALENVS_CREATE=1 \
+	POETRY_CACHE_DIR=/tmp/poetry_cache
+
 WORKDIR /
 
-COPY requirements.txt . 
-RUN pip install --no-cache-dir -r requirements.txt
+COPY pyproject.toml poetry.lock ./
+RUN touch README.md
+
+RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --no-root
+
+FROM python:3.12-slim
+ENV VIRTUAL_ENV=/.venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+COPY  --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
 COPY /app/ /app/
 

diff --git a/backend-app/Dockerfile.prod b/backend-app/Dockerfile.prod
@@ -1,17 +1,35 @@
-FROM python:3.12-slim
+FROM python:3.12-slim AS builder
 
 # Update and install dependencies
 RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*
 
+RUN pip install poetry==1.8.3
+
+ENV POETRY_NO_INTERACTION=1 \
+	POETRY_VIRTUALENVS_IN_PROJECT=1 \
+	POETRY_VIRTUALENVS_CREATE=1 \
+	POETRY_CACHE_DIR=/tmp/poetry_cache
+
 WORKDIR /
 
-COPY requirements.txt . 
-RUN pip install --no-cache-dir -r requirements.txt
+COPY pyproject.toml poetry.lock ./
+RUN touch README.md
+
+RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --without dev --no-root
+
+FROM python:3.12-slim
+ENV VIRTUAL_ENV=/.venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+COPY  --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
 COPY /app/ /app/
 
+ENV FASTAPI_HASH_ALGORITHM=HS256
+ENV ACCESS_TOKEN_EXPIRE_MINUTES=30
 
 EXPOSE 8000
 
 CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
+
diff --git a/backend-app/poetry.lock b/backend-app/poetry.lock
diff --git a/backend-app/pyproject.toml b/backend-app/pyproject.toml
@@ -15,7 +15,7 @@ passlib = "^1.7.4"
 cryptography = "^43.0.0"
 python-jose = "^3.3.0"
 pandas = "^2.2.2"
-psycopg2 = "^2.9.9"
+psycopg2-binary = "^2.9.9"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.2"