Update dockerfile and project

Author: pbashyal-nmdp

.bumpversion.toml

@@ -20,9 +20,8 @@ setup_hooks = []
 pre_commit_hooks = []
 post_commit_hooks = []
 
-
 [[tool.bumpversion.files]]
-filename = "my_project_template/__init__.py"
+filename = "src/my_project_template/__init__.py"
 search =  "__version__ = \"{current_version}\""
 replace = "__version__ = \"{new_version}\""
 
@@ -35,3 +34,8 @@ replace = "version = \"{new_version}\""
 filename = "api-spec.yaml"
 search =  "version: {current_version}"
 replace = "version: {new_version}"
+
+[[tool.bumpversion.files]]
+filename = "Makefile"
+search =  "VERSION := {current_version}"
+replace = "VERSION := {new_version}"

.dockerignore

@@ -1,3 +1,4 @@
+.git
 .github
 .eggs/
 build
@@ -6,9 +7,9 @@ dist
 *.egg-info
 tests
 venv
+.venv
 
 __pycache__
-*.pyc
 *.pyo
 *.pyd
 *.output

Dockerfile

@@ -1,19 +1,44 @@
-FROM python:3.13-slim-trixie
-
+FROM python:3.13-slim-trixie AS builder
 LABEL MAINTAINER="Pradeep Bashyal"
 
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
+ENV UV_PYTHON_PREFERENCE=only-managed
+
 WORKDIR /app
+# Install everything except the package
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv sync --locked --no-install-project --group deploy
+
+# Sync so that Python version is installed
+COPY . /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --group deploy && uv build
+
+
+# Final Docker Image
+FROM python:3.13-slim-trixie
+
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
+WORKDIR /app
+
+# Copy the Python packages
+COPY --from=builder /app/.venv /app/.venv
+
+COPY --from=builder /app/dist/my_project_template-0.0.1-py3-none-any.whl /tmp/
+RUN python3 -m pip install /tmp/my_project_template-0.0.1-py3-none-any.whl
 
 COPY app.py /app/
 COPY api.py /app/
 COPY api-spec.yaml /app/
-COPY my_project_template /app/my_project_template
+COPY run-app.sh /app/
 
-# Sync the project into a new environment, asserting the lockfile is up to date
-COPY pyproject.toml /app/
-COPY uv.lock /app/
-RUN /bin/uv sync --locked --group deploy
+# Put the uv built Python packages in the PATH
+ENV PYTHONPATH="/app/.venv/lib/python3.13/site-packages/:"
 
-CMD [".venv/bin/gunicorn"  , "--bind", "0.0.0.0:8080", "--worker-tmp-dir", "/dev/shm", "app:app"]
+CMD ["/app/run-app.sh"]

Makefile

@@ -58,7 +58,7 @@ lint: ## check style with ruff
 	uv tool run ruff check
 
 behave: clean-test ## run the behave tests, generate and serve report
-	- uv run behave -f allure_behave.formatter:AllureFormatter -o allure_report
+	uv run behave -f allure_behave.formatter:AllureFormatter -o allure_report
 	allure serve allure_report
 
 pytest: clean-test ## run tests quickly with the default Python

pyproject.toml

@@ -1,5 +1,9 @@
+[build-system]
+requires = ["uv_build>=0.8.15,<0.9.0"]
+build-backend = "uv_build"
+
 [project]
-name = "nmdp-python-project-template"
+name = "my_project_template"
 version = "0.0.1"
 description="Python Project Template. Standardized Python project structure for NMDP projects"
 requires-python = ">=3.13"