Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions docker/base/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ARG CC_VARIANT=latest
ARG CC_VERSION
ARG ENABLE_TRACING=false
ARG ENABLE_CUDA=false
ARG CUDA_VERSION=12-6
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated change.

ARG EFA_INSTALLER_VERSION=latest

# Enable all Ubuntu repositories and install base packages
Expand Down Expand Up @@ -72,14 +73,20 @@ RUN if [ "$ENABLE_CUDA" = "true" ]; then \
wget https://developer.download.nvidia.com/compute/cuda/repos/${repo}/$(uname -m)/cuda-keyring_1.1-1_all.deb && \
dpkg -i cuda-keyring_1.1-1_all.deb && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y cuda-cudart-dev-12-6 cuda-crt-12-6 && \
DEBIAN_FRONTEND=noninteractive apt-get install -y cuda-cudart-dev-${CUDA_VERSION} cuda-crt-${CUDA_VERSION} && \
rm -rf /var/lib/apt/lists/*; \
fi

# Install lttng if enabled
# Install tracing packages if enabled. lttng is always installed
# when tracing is on; cuda-nvtx is added for CUDA-enabled images so
# the plugin can be configured with both --with-lttng and
# --with-nvtx=... and exercise both tracing backends together.
RUN if [ "$ENABLE_TRACING" = "true" ]; then \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y liblttng-ust-dev && \
if [ "$ENABLE_CUDA" = "true" ]; then \
DEBIAN_FRONTEND=noninteractive apt-get install -y cuda-nvtx-${CUDA_VERSION} ; \
fi && \
rm -rf /var/lib/apt/lists/*; \
fi

Expand Down
11 changes: 9 additions & 2 deletions docker/base/Dockerfile.ubuntu2404
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ FROM ubuntu:24.04
ARG CC_TYPE=gcc13
ARG ENABLE_TRACING=false
ARG ENABLE_CUDA=false
ARG CUDA_VERSION=12-6
ARG EFA_INSTALLER_VERSION=latest

# Install updates and base packages
Expand Down Expand Up @@ -43,12 +44,18 @@ RUN if [ "$ENABLE_CUDA" = "true" ]; then \
wget https://developer.download.nvidia.com/compute/cuda/repos/${repo}/$(uname -m)/cuda-keyring_1.1-1_all.deb && \
dpkg -i cuda-keyring_1.1-1_all.deb && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y cuda-cudart-dev-12-6 cuda-crt-12-6 ; \
DEBIAN_FRONTEND=noninteractive apt-get install -y cuda-cudart-dev-${CUDA_VERSION} cuda-crt-${CUDA_VERSION} ; \
fi

# Install lttng if enabled
# Install tracing packages if enabled. lttng is always installed
# when tracing is on; cuda-nvtx is added for CUDA-enabled images so
# the plugin can be configured with both --with-lttng and
# --with-nvtx=... and exercise both tracing backends together.
RUN if [ "$ENABLE_TRACING" = "true" ]; then \
DEBIAN_FRONTEND=noninteractive apt-get install -y liblttng-ust-dev ; \
if [ "$ENABLE_CUDA" = "true" ]; then \
DEBIAN_FRONTEND=noninteractive apt-get install -y cuda-nvtx-${CUDA_VERSION} ; \
fi ; \
fi

RUN rm -rf /var/lib/apt/lists/*
Expand Down
Loading