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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ jobs:
uses: docker/build-push-action@v7
with:
context: .
cache-from: type=registry,ref=ldmx/dev:build-cache-${{ matrix.platform }}
cache-to: type=registry,ref=ldmx/dev:build-cache-${{ matrix.platform }},mode=max
platforms: linux/${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
Expand Down
28 changes: 19 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:24.04
FROM ubuntu:26.04
LABEL maintainer="Tom Eichlersmith <eichl008@umn.edu>, Tamas Almos Vami <Tamas.Almos.Vami@cern.ch>"
LABEL ubuntu.version="24.04"
LABEL ubuntu.version="26.04"

ARG NPROC=1

Expand All @@ -22,6 +22,7 @@ RUN install-ubuntu-packages \
ccache \
cmake \
gcc g++ gfortran \
gcc-13 g++-13 \
libcurl4-openssl-dev \
locales \
make \
Expand Down Expand Up @@ -119,7 +120,6 @@ RUN mkdir src && \

RUN install-ubuntu-packages \
fonts-freefont-ttf \
libafterimage-dev \
libfftw3-dev \
libfreetype6-dev \
libftgl-dev \
Expand All @@ -141,10 +141,10 @@ RUN install-ubuntu-packages \
libz-dev \
libzstd-dev \
nlohmann-json3-dev \
srm-ifce-dev \
libgsl-dev
libgsl-dev \
libcrypt-dev

ENV ROOT_VERSION="6.34.10"
ENV ROOT_VERSION="6.38.04"
LABEL root.version=${ROOT_VERSION}
RUN mkdir src &&\
${__wget} https://root.cern/download/root_v${ROOT_VERSION}.source.tar.gz |\
Expand All @@ -154,6 +154,8 @@ RUN mkdir src &&\
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${__prefix} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_CXX_FLAGS="-fno-strict-aliasing" \
-DCMAKE_C_FLAGS="-fno-strict-aliasing" \
-Dgnuinstall=ON \
-Dgminimal=ON \
-Dasimage=ON \
Expand All @@ -162,8 +164,8 @@ RUN mkdir src &&\
-Dopengl=ON \
-Dpyroot=ON \
-Dxrootd=OFF \
-Dmathmore=ON \
-Dpythia8=ON \
-Dmathmore=ON \
-Dpythia8=ON \
-B build \
-S src \
&& cmake --build build --target install -j$NPROC &&\
Expand Down Expand Up @@ -199,7 +201,13 @@ RUN __owner="geant4" &&\
-DGEANT4_USE_GDML=ON \
-DGEANT4_INSTALL_EXAMPLES=OFF \
-DGEANT4_USE_OPENGL_X11=ON \
-DGEANT4_USE_SYSTEM_ZLIB=ON \
-DCMAKE_INSTALL_PREFIX=${__prefix} \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_C_COMPILER=gcc-13 \
-DCMAKE_CXX_COMPILER=g++-13 \
-DCMAKE_CXX_FLAGS="-fno-strict-aliasing" \
-DCMAKE_C_FLAGS="-fno-strict-aliasing" \
-B src/build \
-S src \
&&\
Expand Down Expand Up @@ -259,7 +267,8 @@ RUN mkdir src &&\
-DHEPMC3_BUILD_STATIC_LIBS:BOOL=ON \
-DHEPMC3_BUILD_DOCS:BOOL=OFF \
-DHEPMC3_ENABLE_PYTHON:BOOL=ON \
-DHEPMC3_PYTHON_VERSIONS=3.10 \
-DHEPMC3_PYTHON_VERSIONS=3.14 \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-B src/build \
-S src \
&&\
Expand Down Expand Up @@ -399,6 +408,7 @@ RUN install-ubuntu-packages \
ca-certificates \
clang-format \
libboost-all-dev \
libcurl4-openssl-dev \
libssl-dev

###############################################################################
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ which provides support for Docker, Podman, and Apptainer.

Software Package | Version | Construction Process
---|---|---
[Ubuntu Server](https://ubuntu.com/) | 24.04 | Base Image
[GCC](https://gcc.gnu.org/) | 13.3.0 | From Ubuntu Repos
[Python](https://www.python.org/) | 3.12.3 | From Ubuntu Repos
[cmake](https://cmake.org/) | 3.28.3 | From Ubuntu Repos
[Boost](https://www.boost.org/doc/libs/1_83_0/) | 1.83.0 | From Ubuntu Repos
[Ubuntu Server](https://ubuntu.com/) | 26.04 | Base Image
[GCC](https://gcc.gnu.org/) | 15.2.0 | From Ubuntu Repos
[Python](https://www.python.org/) | 3.14.4 | From Ubuntu Repos
[cmake](https://cmake.org/) | 4.3.2 | From Ubuntu Repos
[Boost](https://www.boost.org/doc/libs/1_90_0/) | 1.9.0 | From Ubuntu Repos
[XercesC](http://xerces.apache.org/xerces-c/) | 3.3.0 | Built from source
[LHAPDF](https://www.lhapdf.org/) | 6.5.5 | Built from source
[Pythia8](https://pythia.org/) | 8.313 | Built from source
[nlohmann/json](https://json.nlohmann.me/) | 3.11.3 | From Ubuntu Repos
[ROOT](https://root.cern.ch/) | 6.34.10 | Built from source
[ROOT](https://root.cern.ch/) | 6.38.04 | Built from source
[Geant4](https://geant4.web.cern.ch/) | [LDMX.10.2.3\_v0.6](https://github.com/LDMX-Software/geant4/tree/LDMX.10.2.3_v0.6) | Built from source
[Eigen](https://eigen.tuxfamily.org) | 3.4.0 | Built from source
[HEPMC3](https://hepmc.web.cern.ch) | 3.3.0 | Built from source
Expand All @@ -55,7 +55,7 @@ Software Package | Version | Construction Process
[Catch2](https://github.com/catchorg/Catch2) | 3.8.0 | Built from source
[Acts](https://acts.readthedocs.io/en/v36.0.0/) | 36.0.0 | Built from source
[ONNX Runtime](https://github.com/microsoft/onnxruntime) | 1.15.0 | Download pre-built binaries
[Clang](https://clang.llvm.org/) | 18.1.3 | From Ubuntu Repos
[Clang](https://clang.llvm.org/) | 21.1.8 | From Ubuntu Repos

More detailed documentation of the available software is online.
- [Ubuntu Packages](https://ldmx-software.github.io/dev-build-context/ubuntu-packages.html)
Expand Down
1 change: 1 addition & 0 deletions install-ubuntu-packages.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
set -e
#
# Installs any dependencies from the ubuntu repos that are passed in as
# arguments.
Expand Down