Skip to content

Commit 918c77b

Browse files
committed
Update to Ubuntu 26.04 and ROOT 6.38.04
1 parent c231a60 commit 918c77b

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ubuntu:24.04
1+
FROM ubuntu:26.04
22
LABEL maintainer="Tom Eichlersmith <eichl008@umn.edu>, Tamas Almos Vami <Tamas.Almos.Vami@cern.ch>"
3-
LABEL ubuntu.version="24.04"
3+
LABEL ubuntu.version="26.04"
44

55
ARG NPROC=1
66

@@ -19,6 +19,7 @@ RUN chmod +x /usr/local/bin/install-ubuntu-packages
1919
# Basic OS/System tools
2020
RUN install-ubuntu-packages \
2121
binutils \
22+
ccache \
2223
cmake \
2324
gcc g++ gfortran \
2425
locales \
@@ -117,7 +118,6 @@ RUN mkdir src && \
117118

118119
RUN install-ubuntu-packages \
119120
fonts-freefont-ttf \
120-
libafterimage-dev \
121121
libfftw3-dev \
122122
libfreetype6-dev \
123123
libftgl-dev \
@@ -139,10 +139,10 @@ RUN install-ubuntu-packages \
139139
libz-dev \
140140
libzstd-dev \
141141
nlohmann-json3-dev \
142-
srm-ifce-dev \
143-
libgsl-dev
142+
libgsl-dev \
143+
libcrypt-dev
144144

145-
ENV ROOT_VERSION="6.34.10"
145+
ENV ROOT_VERSION="6.38.04"
146146
LABEL root.version=${ROOT_VERSION}
147147
RUN mkdir src &&\
148148
${__wget} https://root.cern/download/root_v${ROOT_VERSION}.source.tar.gz |\
@@ -197,7 +197,9 @@ RUN __owner="geant4" &&\
197197
-DGEANT4_USE_GDML=ON \
198198
-DGEANT4_INSTALL_EXAMPLES=OFF \
199199
-DGEANT4_USE_OPENGL_X11=ON \
200+
-DGEANT4_USE_SYSTEM_ZLIB=ON \
200201
-DCMAKE_INSTALL_PREFIX=${__prefix} \
202+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
201203
-B src/build \
202204
-S src \
203205
&&\
@@ -257,7 +259,8 @@ RUN mkdir src &&\
257259
-DHEPMC3_BUILD_STATIC_LIBS:BOOL=ON \
258260
-DHEPMC3_BUILD_DOCS:BOOL=OFF \
259261
-DHEPMC3_ENABLE_PYTHON:BOOL=ON \
260-
-DHEPMC3_PYTHON_VERSIONS=3.10 \
262+
-DHEPMC3_PYTHON_VERSIONS=3.14 \
263+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
261264
-B src/build \
262265
-S src \
263266
&&\

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Software Package | Version | Construction Process
4646
[LHAPDF](https://www.lhapdf.org/) | 6.5.5 | Built from source
4747
[Pythia8](https://pythia.org/) | 8.313 | Built from source
4848
[nlohmann/json](https://json.nlohmann.me/) | 3.11.3 | From Ubuntu Repos
49-
[ROOT](https://root.cern.ch/) | 6.34.10 | Built from source
49+
[ROOT](https://root.cern.ch/) | 6.38.04 | Built from source
5050
[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
5151
[Eigen](https://eigen.tuxfamily.org) | 3.4.0 | Built from source
5252
[HEPMC3](https://hepmc.web.cern.ch) | 3.3.0 | Built from source

install-ubuntu-packages.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23
#
34
# Installs any dependencies from the ubuntu repos that are passed in as
45
# arguments.

0 commit comments

Comments
 (0)