Update Dockerfile for faster building (#936)

* Update Dockerfile for faster building

* Fix build error

* Copy file for maturin

* Fix build error

* Update snapshots

* Fix command

* Update snapshots

* Remove extra trailing slash

* Update snapshots

Author: sanders41

src/fastapi/docker_files.rs

@@ -422,11 +422,13 @@ RUN sh /uv-installer.sh && rm /uv-installer.sh
 
 ENV PATH="/root/.local/bin:$PATH"
 
+# Create virtual environment and download Python
+RUN uv venv -p {python_version}
+
 COPY . ./
 
 RUN --mount=type=cache,target=/root/.cache/uv \
-  uv venv -p {python_version} \
-  && uv sync --locked --no-dev --no-editable
+  uv sync --locked --no-dev --no-editable
 
 
 # Build production stage
@@ -557,11 +559,12 @@ RUN : \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
+# Create virtual environment
+RUN python{python_version} -m venv .venv
+
 COPY . ./
 
-RUN : \
-  && python{python_version} -m venv .venv \
-  && .venv/bin/python -m pip install -r requirements.txt
+RUN .venv/bin/python -m pip install -r requirements.txt
 
 
 # Build production stage
@@ -638,22 +641,24 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de
 
 ENV PATH="/root/.local/bin:/root/.cargo/bin:$PATH"
 
-COPY Cargo.toml Cargo.lock ./
+# Create virtual environment and download Python
+RUN uv venv -p {python_version}
 
-COPY pyproject.toml uv.lock ./
+COPY pyproject.toml Cargo.toml Cargo.lock README.md LICENSE ./
+COPY src/ ./src
+RUN mkdir {source_dir}
 
-RUN --mount=type=cache,target=/root/.cache/uv \
-  uv venv -p {python_version} \
-  && uv sync --locked --no-dev --no-install-project --no-editable
+RUN --mount=type=cache,target=/app/target/ \
+  --mount=type=cache,target=/usr/local/cargo/git/db \
+  --mount=type=cache,target=/usr/local/cargo/registry/ \
+  uv tool run maturin develop -r
 
-COPY . ./
+COPY uv.lock ./
 
 RUN --mount=type=cache,target=/root/.cache/uv \
-  --mount=type=cache,target=/app/target/ \
-  --mount=type=cache,target=/usr/local/cargo/git/db \
-  --mount=type=cache,target=/usr/local/cargo/registry/ \
-  uv sync --locked --no-dev --no-editable \
-  && uv tool run maturin develop -r
+  uv sync --locked --no-dev --no-install-project
+
+COPY . /app
 
 
 # Build production stage
@@ -723,13 +728,25 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de
 
 ENV PATH="/root/.local/bin:/root/.cargo/bin:$PATH"
 
+# Create virtual environment
+RUN python{python_version} -m venv .venv
+
+COPY pyproject.toml Cargo.toml Cargo.lock README.md LICENSE ./
+COPY src/ ./src
+RUN mkdir {source_dir}
+
+RUN --mount=type=cache,target=/app/target/ \
+  --mount=type=cache,target=/usr/local/cargo/git/db \
+  --mount=type=cache,target=/usr/local/cargo/registry/ \
+  uv tool run maturin develop -r
+
 COPY requirements.txt ./
 
-RUN : \
-  && python{python_version} -m venv .venv \
-  && .venv/bin/python -m pip install -r requirements.txt
+RUN --mount=type=cache,target=/root/.cache/uv \
+  .venv/bin/python -m pip install -r requirements.txt
+
+COPY . /app
 
-COPY . ./
 
 RUN --mount=type=cache,target=/usr/local/cargo/git/db \
   --mount=type=cache,target=/usr/local/cargo/registry/ \

src/fastapi/snapshots/python_project__fastapi__docker_files__tests__save_dockerfile_maturin_setuptools.snap

@@ -2,4 +2,4 @@
 source: src/fastapi/docker_files.rs
 expression: content
 ---
-"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  UV_PYTHON_INSTALL_DIR=/opt/uv/python \\\n  UV_LINK_MODE=copy\n\nRUN : \\\n && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  build-essential \\\n  curl \\\n  ca-certificates \\\n  libssl-dev \\\n  pkg-config \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  python3.11-venv \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\n# Install uv\nADD https://astral.sh/uv/install.sh /uv-installer.sh\n\nRUN sh /uv-installer.sh && rm /uv-installer.sh\n\n# Install rust\nRUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal\n\nENV PATH=\"/root/.local/bin:/root/.cargo/bin:$PATH\"\n\nCOPY requirements.txt ./\n\nRUN : \\\n  && python3.11 -m venv .venv \\\n  && .venv/bin/python -m pip install -r requirements.txt\n\nCOPY . ./\n\nRUN --mount=type=cache,target=/usr/local/cargo/git/db \\\n  --mount=type=cache,target=/usr/local/cargo/registry/ \\\n  .venv/bin/python -m pip install -r requirements.txt \\\n  && uv tool run maturin develop -r\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"
+"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  UV_PYTHON_INSTALL_DIR=/opt/uv/python \\\n  UV_LINK_MODE=copy\n\nRUN : \\\n && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  build-essential \\\n  curl \\\n  ca-certificates \\\n  libssl-dev \\\n  pkg-config \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  python3.11-venv \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\n# Install uv\nADD https://astral.sh/uv/install.sh /uv-installer.sh\n\nRUN sh /uv-installer.sh && rm /uv-installer.sh\n\n# Install rust\nRUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal\n\nENV PATH=\"/root/.local/bin:/root/.cargo/bin:$PATH\"\n\n# Create virtual environment\nRUN python3.11 -m venv .venv\n\nCOPY pyproject.toml Cargo.toml Cargo.lock README.md LICENSE ./\nCOPY src/ ./src\nRUN mkdir my_project\n\nRUN --mount=type=cache,target=/app/target/ \\\n  --mount=type=cache,target=/usr/local/cargo/git/db \\\n  --mount=type=cache,target=/usr/local/cargo/registry/ \\\n  uv tool run maturin develop -r\n\nCOPY requirements.txt ./\n\nRUN --mount=type=cache,target=/root/.cache/uv \\\n  .venv/bin/python -m pip install -r requirements.txt\n\nCOPY . /app\n\n\nRUN --mount=type=cache,target=/usr/local/cargo/git/db \\\n  --mount=type=cache,target=/usr/local/cargo/registry/ \\\n  .venv/bin/python -m pip install -r requirements.txt \\\n  && uv tool run maturin develop -r\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"

src/fastapi/snapshots/python_project__fastapi__docker_files__tests__save_dockerfile_maturin_uv.snap

@@ -2,4 +2,4 @@
 source: src/fastapi/docker_files.rs
 expression: content
 ---
-"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  UV_PYTHON_INSTALL_DIR=/opt/uv/python \\\n  UV_LINK_MODE=copy\n\nRUN : \\\n && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  build-essential \\\n  curl \\\n  ca-certificates \\\n  libssl-dev \\\n  pkg-config \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\n# Install uv\nADD https://astral.sh/uv/install.sh /uv-installer.sh\n\nRUN sh /uv-installer.sh && rm /uv-installer.sh\n\n# Install rust\nRUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal\n\nENV PATH=\"/root/.local/bin:/root/.cargo/bin:$PATH\"\n\nCOPY Cargo.toml Cargo.lock ./\n\nCOPY pyproject.toml uv.lock ./\n\nRUN --mount=type=cache,target=/root/.cache/uv \\\n  uv venv -p 3.11 \\\n  && uv sync --locked --no-dev --no-install-project --no-editable\n\nCOPY . ./\n\nRUN --mount=type=cache,target=/root/.cache/uv \\\n  --mount=type=cache,target=/app/target/ \\\n  --mount=type=cache,target=/usr/local/cargo/git/db \\\n  --mount=type=cache,target=/usr/local/cargo/registry/ \\\n  uv sync --locked --no-dev --no-editable \\\n  && uv tool run maturin develop -r\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY --from=builder /opt/uv/python /opt/uv/python\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"
+"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  UV_PYTHON_INSTALL_DIR=/opt/uv/python \\\n  UV_LINK_MODE=copy\n\nRUN : \\\n && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  build-essential \\\n  curl \\\n  ca-certificates \\\n  libssl-dev \\\n  pkg-config \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\n# Install uv\nADD https://astral.sh/uv/install.sh /uv-installer.sh\n\nRUN sh /uv-installer.sh && rm /uv-installer.sh\n\n# Install rust\nRUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal\n\nENV PATH=\"/root/.local/bin:/root/.cargo/bin:$PATH\"\n\n# Create virtual environment and download Python\nRUN uv venv -p 3.11\n\nCOPY pyproject.toml Cargo.toml Cargo.lock README.md LICENSE ./\nCOPY src/ ./src\nRUN mkdir my_project\n\nRUN --mount=type=cache,target=/app/target/ \\\n  --mount=type=cache,target=/usr/local/cargo/git/db \\\n  --mount=type=cache,target=/usr/local/cargo/registry/ \\\n  uv tool run maturin develop -r\n\nCOPY uv.lock ./\n\nRUN --mount=type=cache,target=/root/.cache/uv \\\n  uv sync --locked --no-dev --no-install-project\n\nCOPY . /app\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY --from=builder /opt/uv/python /opt/uv/python\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"

src/fastapi/snapshots/python_project__fastapi__docker_files__tests__save_dockerfile_setuptools.snap

@@ -2,4 +2,4 @@
 source: src/fastapi/docker_files.rs
 expression: content
 ---
-"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/root/.local/bin:$PATH\"\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  python3.11-venv \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\nCOPY . ./\n\nRUN : \\\n  && python3.11 -m venv .venv \\\n  && .venv/bin/python -m pip install -r requirements.txt\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"
+"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/root/.local/bin:$PATH\"\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  python3.11-venv \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\n# Create virtual environment\nRUN python3.11 -m venv .venv\n\nCOPY . ./\n\nRUN .venv/bin/python -m pip install -r requirements.txt\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  software-properties-common \\\n  && add-apt-repository ppa:deadsnakes/ppa \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  python3.11 \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"

src/fastapi/snapshots/python_project__fastapi__docker_files__tests__save_dockerfile_uv.snap

@@ -2,4 +2,4 @@
 source: src/fastapi/docker_files.rs
 expression: content
 ---
-"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  UV_PYTHON_INSTALL_DIR=/opt/uv/python \\\n  UV_LINK_MODE=copy\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  curl \\\n  ca-certificates \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\n# Install uv\nADD https://astral.sh/uv/install.sh /uv-installer.sh\n\nRUN sh /uv-installer.sh && rm /uv-installer.sh\n\nENV PATH=\"/root/.local/bin:$PATH\"\n\nCOPY . ./\n\nRUN --mount=type=cache,target=/root/.cache/uv \\\n  uv venv -p 3.11 \\\n  && uv sync --locked --no-dev --no-editable\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY --from=builder /opt/uv/python /opt/uv/python\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"
+"# syntax=docker/dockerfile:1\n\nFROM ubuntu:24.04 AS builder\n\nWORKDIR /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  UV_PYTHON_INSTALL_DIR=/opt/uv/python \\\n  UV_LINK_MODE=copy\n\nRUN : \\\n  && apt-get update \\\n  && apt-get install -y --no-install-recommends \\\n  curl \\\n  ca-certificates \\\n  && apt-get clean \\\n  && rm -rf /var/lib/apt/lists/*\n\n# Install uv\nADD https://astral.sh/uv/install.sh /uv-installer.sh\n\nRUN sh /uv-installer.sh && rm /uv-installer.sh\n\nENV PATH=\"/root/.local/bin:$PATH\"\n\n# Create virtual environment and download Python\nRUN uv venv -p 3.11\n\nCOPY . ./\n\nRUN --mount=type=cache,target=/root/.cache/uv \\\n  uv sync --locked --no-dev --no-editable\n\n\n# Build production stage\nFROM ubuntu:24.04 AS prod\n\nRUN useradd appuser\n\nWORKDIR /app\n\nRUN chown appuser:appuser /app\n\nENV \\\n  PYTHONUNBUFFERED=true \\\n  PATH=\"/app/.venv/bin:$PATH\" \\\n  PORT=\"8000\"\n\nCOPY --from=builder /app/.venv /app/.venv\nCOPY --from=builder /app/my_project /app/my_project\nCOPY --from=builder /opt/uv/python /opt/uv/python\nCOPY ./scripts/entrypoint.sh /app\n\nRUN chmod +x /app/entrypoint.sh\n\nEXPOSE 8000\n\nUSER appuser\n\nENTRYPOINT [\"./entrypoint.sh\"]\n"