Skip to content
Closed
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
14 changes: 7 additions & 7 deletions ContainerFile/ubuntu-ldms/Dockerfile.bld_n_run.ubuntu24.04
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# build ldms

#FROM ovishpc/ovis-ubuntu-build as ldms_builder
FROM ubuntu:24.04 as ldms_builder
FROM ubuntu:25.10 as ldms_builder

#ARG and ENV declarations for OVIS_TAG and REPO
ARG OVIS_TAG="v4.5.1"
ARG OVIS_TAG="main"
ENV TAG=${OVIS_TAG}
ARG OVIS_REPO="https://github.com/ovis-hpc/ovis.git"
ENV REPO=${OVIS_REPO}
Expand All @@ -31,7 +31,7 @@ RUN apt-get update \
libibverbs-dev \
libjansson-dev \
libavro-dev \
libavro23 \
libavro24 \
librdkafka-dev \
python3-pyverbs \
librdmacm-dev \
Expand Down Expand Up @@ -67,7 +67,7 @@ RUN python3 -m pip install --break-system-packages --upgrade --ignore-installed
python3 -m pip --version

# Broken cython ships with ubuntu:24.04 - also upgrade setuptools for security
RUN /bin/bash -c 'set -e ; pip3 install --break-system-packages --upgrade setuptools==80.9.0 ; pip3 install --break-system-packages Cython==3.0.12 ; ln -s /usr/local/bin/cython /usr/local/bin/cython3 ;'
RUN /bin/bash -c 'set -e ; pip3 install --break-system-packages --upgrade setuptools==80.10.2 wheel==0.46.2 ; pip3 install --break-system-packages Cython==3.0.12 ; ln -s /usr/local/bin/cython /usr/local/bin/cython3 ;'

# libserdes needed by avro_kafka
RUN echo "Build libserdes" \
Expand Down Expand Up @@ -104,7 +104,7 @@ RUN echo "Build ldms" \
# TODO: apt-get install --no-install-recommends -y \
# TODO: rm -rf /root/.cache/pip/*

FROM ubuntu:24.04
FROM ubuntu:25.10

ARG VER="0.1"
ENV VER=${VER}
Expand All @@ -128,7 +128,7 @@ RUN apt-get update \
iproute2 \
jq \
less \
libavro23 \
libavro24 \
libpapi-dev \
libpfm4 \
librdkafka1 \
Expand All @@ -155,7 +155,7 @@ RUN python3 -m pip install --break-system-packages --upgrade --ignore-installed
python3 -m pip --version

# Broken cython ships with ubuntu:24.04 - also upgrade setuptools for security (runner stage)
RUN /bin/bash -c 'set -e ; pip3 install --break-system-packages --upgrade setuptools==80.9.0 ; pip3 install --break-system-packages Cython==3.0.12 ; ln -s /usr/local/bin/cython /usr/local/bin/cython3 ;'
RUN /bin/bash -c 'set -e ; pip3 install --break-system-packages --upgrade setuptools==80.10.2 ; pip3 install --break-system-packages Cython==3.0.12 ; ln -s /usr/local/bin/cython /usr/local/bin/cython3 ;'

# ldms exporter needs these
RUN /bin/bash -c 'set -e ; pip3 install --break-system-packages click prometheus_client ;'
Expand Down