⚡️ Optimize Build Order for better caching

Author: joshkreud

Dockerfile

@@ -14,18 +14,14 @@ RUN mkdir -p $PIP_CACHE_DIR
 ARG USERNAME
 LABEL org.opencontainers.image.source=https://github.com/OpenJKSoftware/python-devcontainer
 
-# Install uv
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
-ENV UV_CACHE_DIR=/var/cache/uv \
-    UV_PYTHON_CACHE_DIR=/var/cache/uv/python \
-    UV_LINK_MODE=copy \
-    UV_COMPILE_BYTECODE=1
-RUN set -x; mkdir -p $UV_CACHE_DIR && mkdir -p $UV_PYTHON_CACHE_DIR
-RUN --mount=type=cache,target=/var/cache uv python install ${PYTHONVERSION} --default
+# Ensure Apt cache is kept between builds
+RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 
 # Install Base Reqs
 COPY scripts/install_base_deps.sh /tmp/
-RUN /tmp/install_base_deps.sh
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
+    /tmp/install_base_deps.sh
 
 # Create User and setup environment
 RUN useradd --shell /usr/bin/zsh --create-home ${USERNAME} -u 1000 \
@@ -34,8 +30,17 @@ RUN useradd --shell /usr/bin/zsh --create-home ${USERNAME} -u 1000 \
     && chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}
 ENV EDITOR=nvim
 
+# Sudo Support
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
+    set -x; \
+    apt-get -y install --no-install-recommends sudo \
+    && echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
 # Fix Locale issues
-RUN set -x; \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
+    set -x; \
     apt-get install locales -y --no-install-recommends \
     && echo "LC_ALL=en_US.UTF-8" >> /etc/environment \
     && echo "LANG=en_US.utf-8" >> /etc/environment \
@@ -47,11 +52,16 @@ RUN set -x; \
 COPY known_hosts /root/.ssh/known_hosts
 COPY --chown=${USERNAME}:${USERNAME} known_hosts /home/${USERNAME}/.ssh/known_hosts
 
-# Sudo Support
-RUN set -x; \
-    apt-get -y install --no-install-recommends sudo \
-    && echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+# Install uv
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+ENV UV_CACHE_DIR=/var/cache/uv \
+    UV_PYTHON_CACHE_DIR=/var/cache/uv/python \
+    UV_LINK_MODE=copy \
+    UV_COMPILE_BYTECODE=1
+RUN set -x; mkdir -p $UV_CACHE_DIR && mkdir -p $UV_PYTHON_CACHE_DIR
+RUN --mount=type=cache,target=/var/cache,sharing=locked uv python install ${PYTHONVERSION} --default
 
+RUN apt autoremove --purge -y && apt clean -y
 
 # Non Root User
 USER ${USERNAME}
@@ -63,6 +73,4 @@ RUN set -x ; \
     && sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 COPY --chown=${USERNAME}:${USERNAME} .zshrc .zshrc
 
-
-RUN sudo bash -c "rm -rf {./*,/tmp/*,/var/cache/apt/*,/var/lib/apt/lists/*,$PIP_CACHE_DIR/*}"
 ENTRYPOINT [ "/usr/bin/zsh" ]

scripts/install_base_deps.sh

@@ -26,7 +26,4 @@ apt-get install -y --no-install-recommends \
     jq \
     lsb-release
 
-# Cleanup
-apt-get clean
-
 echo "Base dependencies installation complete"