feat: actualiza dockerfile

Author: albertotb

.dockerignore

@@ -1 +1,4 @@
-.venv
+.*/
+.venv
+node_modules
+*.egg-info

Dockerfile

@@ -1,35 +1,39 @@
-# From https://docs.astral.sh/uv/guides/integration/docker/
-FROM python:3.11-slim
+# First, build the application in the `/app` directory.
+FROM ghcr.io/astral-sh/uv:0.8.0-python3.12-bookworm-slim AS builder
+ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy
 
-# uv installer requires curl (and certificates) to download the release archive
-# ssh and git are required by setuptools_scm for automatic versioning using git
-RUN  apt-get -yq update && apt-get -yqq install --no-install-recommends ssh git curl ca-certificates
+# Disable Python downloads, because we want to use the system interpreter
+# across both images. If using a managed Python version, it needs to be
+# copied from the build image into the final image
+ENV UV_PYTHON_DOWNLOADS=0
 
-# Download the latest installer
-ADD https://astral.sh/uv/0.4.3/install.sh /uv-installer.sh
+# Required for setuptools_scm: https://setuptools-scm.readthedocs.io/en/stable/usage/
+ARG SETUPTOOLS_SCM_PRETEND_VERSION=1
 
-# Run the installer then remove it
-RUN sh /uv-installer.sh && rm /uv-installer.sh
+WORKDIR /app
+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 --frozen --no-install-project --no-dev
 
-# Ensure the installed binary is on the `PATH`
-ENV PATH="/root/.cargo/bin/:$PATH"
+ADD . /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --frozen --no-dev
 
-# Change the working directory to the `app` directory
-WORKDIR /app
 
-# Copy the lockfile and `pyproject.toml` into the image
-COPY uv.lock /app/uv.lock
-COPY pyproject.toml /app/pyproject.toml
+# Then, use a final image without uv
+FROM python:3.12-slim-bookworm
+# It is important to use the image that matches the builder, as the path to the
+# Python executable must be the same, e.g., using `python:3.11-slim-bookworm`
+# will fail.
 
-# Install dependencies
-RUN uv sync --frozen --no-cache --no-dev --no-install-project
+# Copy the application from the builder
+COPY --from=builder --chown=app:app /app /app
 
-# Copy the project into the image
-COPY . /app
+# Place executables in the environment at the front of the path
+ENV PATH="/app/.venv/bin:$PATH"
 
-# Sync the project into a new environment
-# Mounting the git directory is required by setuptools_scm: https://setuptools-scm.readthedocs.io/en/stable/usage/
-RUN --mount=source=.git,target=.git,type=bind \
-    uv sync --frozen --no-cache --no-dev
+WORKDIR /app
 
-CMD ["uv", "run", "uvicorn", "template.api:app", "--host", "0.0.0.0", "--port", "80"]
+# Run the FastAPI application by default
+CMD ["uvicorn", "template.api:app", "--host", "0.0.0.0", "--port", "80"]

Makefile

@@ -1,5 +1,5 @@
 .ONESHELL:
-.PHONY: install hooks hooks-update ruff test mypy docker build run debug push
+.PHONY: install hooks hooks-update ruff test test-api docker build run debug attach push
 
 SHELL=/bin/bash
 DOCKER_IMG_NAME=ghcr.io/komorebi-ai/python-template
@@ -34,8 +34,8 @@ ruff:
 test:
 	uv run pytest
 
-mypy:
-	uv run mypy --install-types --non-interactive
+test-api:
+	uvx --from httpie http GET localhost:6000
 
 docker: build run
 
@@ -45,11 +45,14 @@ build:
 # https://stackoverflow.com/questions/26564825/what-is-the-meaning-of-a-double-dollar-sign-in-bash-makefile
 run:
 	[ "$$(docker ps -a | grep $(DOCKER_CONTAINER))" ] && docker stop $(DOCKER_CONTAINER) && docker rm $(DOCKER_CONTAINER)
-	docker run -d --restart=unless-stopped --name $(DOCKER_CONTAINER) -p 5000:80 $(DOCKER_IMG_NAME)
+	docker run -d --restart=unless-stopped --name $(DOCKER_CONTAINER) -p 6000:80 $(DOCKER_IMG_NAME)
 
 debug:
 	docker run -it $(DOCKER_IMG_NAME) /bin/bash
 
+attach:
+	docker exec -it $(DOCKER_CONTAINER) /bin/bash
+
 push:
 	docker login https://ghcr.io/komorebi-ai -u $(GH_USER) --password-stdin < $(GH_TOKEN_FILE)
-	docker push $(DOCKER_IMG_NAME):latest
+	docker push $(DOCKER_IMG_NAME):latest