Skip to content

chore(ci): use cache mount for apt install to speed up docker build #15441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −36
Open

chore(ci): use cache mount for apt install to speed up docker build #15441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions docker/datahub-actions/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,21 @@ RUN existing_group=$(getent group 1000 | cut -d: -f1) && \

# Setup the PPA for alternative Python versions.
# TODO: Eventually we should switch to using uv's support for python-build-standalone.
RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
software-properties-common \
lsb-release \
gnupg \
ca-certificates \
&& add-apt-repository --no-update ppa:deadsnakes/ppa \
&& rm -rf /var/lib/apt/lists/*
&& add-apt-repository --no-update ppa:deadsnakes/ppa

ARG PYTHON_VERSION
RUN test -n "${PYTHON_VERSION}" # PYTHON_VERSION must be set

RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
python${PYTHON_VERSION} \
python${PYTHON_VERSION}-venv \
python${PYTHON_VERSION}-dev \
Expand All @@ -64,8 +67,7 @@ RUN apt-get update && apt-get install -y \
curl \
zip \
unzip \
nano \
&& rm -rf /var/lib/apt/lists/*
nano

# Set the default python version.
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1 \
Expand Down Expand Up @@ -93,7 +95,9 @@ ENV SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
FROM python-base AS ingestion-base-slim

USER 0
RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
python3-ldap \
libldap2-dev \
libsasl2-dev \
Expand All @@ -107,18 +111,18 @@ RUN apt-get update && apt-get install -y \
librdkafka-dev \
ldap-utils \
unixodbc \
libodbc2 \
&& rm -rf /var/lib/apt/lists/*
libodbc2
USER datahub

FROM ingestion-base-slim AS ingestion-base-full

USER 0
# We need to install build-essential in order to build some Python packages (e.g. python-ldap)
RUN apt-get update && apt-get install --no-install-recommends -y -qq \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install --no-install-recommends -y -qq \
default-jre-headless \
build-essential \
&& rm -rf /var/lib/apt/lists/*
build-essential

RUN --mount=type=bind,source=./docker/snippets/oracle_instantclient.sh,target=/oracle_instantclient.sh \
/oracle_instantclient.sh
Expand Down
28 changes: 16 additions & 12 deletions docker/datahub-ingestion-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,21 @@ RUN existing_group=$(getent group 1000 | cut -d: -f1) && \

# Setup the PPA for alternative Python versions.
# TODO: Eventually we should switch to using uv's support for python-build-standalone.
RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
software-properties-common \
lsb-release \
gnupg \
ca-certificates \
&& add-apt-repository --no-update ppa:deadsnakes/ppa \
&& rm -rf /var/lib/apt/lists/*
&& add-apt-repository --no-update ppa:deadsnakes/ppa

ARG PYTHON_VERSION
RUN test -n "${PYTHON_VERSION}" # PYTHON_VERSION must be set

RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
python${PYTHON_VERSION} \
python${PYTHON_VERSION}-venv \
python${PYTHON_VERSION}-dev \
Expand All @@ -63,8 +66,7 @@ RUN apt-get update && apt-get install -y \
curl \
zip \
unzip \
nano \
&& rm -rf /var/lib/apt/lists/*
nano

# Set the default python version.
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1 \
Expand Down Expand Up @@ -92,7 +94,9 @@ ENV SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
FROM python-base AS ingestion-base-slim

USER 0
RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
python3-ldap \
libldap2-dev \
libsasl2-dev \
Expand All @@ -106,18 +110,18 @@ RUN apt-get update && apt-get install -y \
librdkafka-dev \
ldap-utils \
unixodbc \
libodbc2 \
&& rm -rf /var/lib/apt/lists/*
libodbc2
USER datahub

FROM ingestion-base-slim AS ingestion-base-full

USER 0
# We need to install build-essential in order to build some Python packages (e.g. python-ldap)
RUN apt-get update && apt-get install --no-install-recommends -y -qq \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install --no-install-recommends -y -qq \
default-jre-headless \
build-essential \
&& rm -rf /var/lib/apt/lists/*
build-essential

RUN --mount=type=bind,source=./docker/snippets/oracle_instantclient.sh,target=/oracle_instantclient.sh \
/oracle_instantclient.sh
Expand Down
28 changes: 16 additions & 12 deletions docker/datahub-ingestion/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,21 @@ RUN existing_group=$(getent group 1000 | cut -d: -f1) && \

# Setup the PPA for alternative Python versions.
# TODO: Eventually we should switch to using uv's support for python-build-standalone.
RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
software-properties-common \
lsb-release \
gnupg \
ca-certificates \
&& add-apt-repository --no-update ppa:deadsnakes/ppa \
&& rm -rf /var/lib/apt/lists/*
&& add-apt-repository --no-update ppa:deadsnakes/ppa

ARG PYTHON_VERSION
RUN test -n "${PYTHON_VERSION}" # PYTHON_VERSION must be set

RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
python${PYTHON_VERSION} \
python${PYTHON_VERSION}-venv \
python${PYTHON_VERSION}-dev \
Expand All @@ -64,8 +67,7 @@ RUN apt-get update && apt-get install -y \
curl \
zip \
unzip \
nano \
&& rm -rf /var/lib/apt/lists/*
nano

# Set the default python version.
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1 \
Expand Down Expand Up @@ -93,7 +95,9 @@ ENV SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
FROM python-base AS ingestion-base-slim

USER 0
RUN apt-get update && apt-get install -y \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install -y \
python3-ldap \
libldap2-dev \
libsasl2-dev \
Expand All @@ -107,18 +111,18 @@ RUN apt-get update && apt-get install -y \
librdkafka-dev \
ldap-utils \
unixodbc \
libodbc2 \
&& rm -rf /var/lib/apt/lists/*
libodbc2
USER datahub

FROM ingestion-base-slim AS ingestion-base-full

USER 0
# We need to install build-essential in order to build some Python packages (e.g. python-ldap)
RUN apt-get update && apt-get install --no-install-recommends -y -qq \
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
apt-get update && apt-get install --no-install-recommends -y -qq \
default-jre-headless \
build-essential \
&& rm -rf /var/lib/apt/lists/*
build-essential

RUN --mount=type=bind,source=./docker/snippets/oracle_instantclient.sh,target=/oracle_instantclient.sh \
/oracle_instantclient.sh
Expand Down
Loading