Skip to content

Commit 0e1db51

Browse files
bump ROOT to RNTuple standardized 6.34
drop GENIE and its dep LHAPDF (for now), trying to get a build on DockerHub so its easier to test run the new OS and updated ROOT on other computers
1 parent e7966b6 commit 0e1db51

File tree

1 file changed

+3
-77
lines changed

1 file changed

+3
-77
lines changed

Dockerfile

+3-77
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ RUN install-ubuntu-packages \
193193
srm-ifce-dev \
194194
libgsl-dev # Necessary for GENIE
195195

196-
ENV ROOT_VERSION="6.32.08"
196+
ENV ROOT_VERSION="6.34.02"
197197
LABEL root.version=${ROOT_VERSION}
198198
RUN mkdir src &&\
199199
${__wget} https://root.cern/download/root_v${ROOT_VERSION}.source.tar.gz |\
@@ -210,7 +210,7 @@ RUN mkdir src &&\
210210
-Dopengl=ON \
211211
-Dpyroot=ON \
212212
-Dxrootd=OFF \
213-
-Dmathmore=ON \
213+
-Dmathmore=ON \
214214
-B build \
215215
-S src \
216216
&& cmake --build build --target install -j$NPROC &&\
@@ -264,6 +264,7 @@ ENV G4ABLADATA="${G4DATADIR}/G4ABLA3.0"
264264
ENV G4INCLDATA="${G4DATADIR}/G4INCL1.0"
265265
ENV G4ENSDFSTATEDATA="${G4DATADIR}/G4ENSDFSTATE1.2.3"
266266
ENV G4NEUTRONXSDATA="${G4DATADIR}/G4NEUTRONXS1.4"
267+
267268
################################################################################
268269
# Install Eigen headers into container
269270
#
@@ -288,81 +289,6 @@ RUN mkdir src &&\
288289
rm -rf src
289290

290291

291-
###############################################################################
292-
# LHAPDF
293-
#
294-
# Needed for GENIE
295-
#
296-
# - We disable the python subpackage because it is based on Python2 whose
297-
# executable has been removed from Ubuntu 22.04.
298-
###############################################################################
299-
ENV LHAPDF_VERSION="6.5.3"
300-
LABEL lhapdf.version=${LHAPDF_VERSION}
301-
RUN mkdir src &&\
302-
${__wget} https://lhapdf.hepforge.org/downloads/?f=LHAPDF-${LHAPDF_VERSION}.tar.gz |\
303-
${__untar} &&\
304-
cd src &&\
305-
./configure --disable-python --prefix=${__prefix} &&\
306-
make -j$NPROC install &&\
307-
cd ../ &&\
308-
rm -rf src
309-
310-
###############################################################################
311-
# GENIE
312-
#
313-
# Needed for ... GENIE :)
314-
#
315-
# - GENIE looks in ${ROOTSYS}/lib for various ROOT libraries it depends on.
316-
# This is annoying because root installs its libs to ${ROOTSYS}/lib/root
317-
# when the gnuinstall parameter is ON. We fixed this by forcing ROOT to
318-
# install its libs to ${ROOTSYS}/lib even with gnuinstall ON.
319-
# - liblog4cpp5-dev from the Ubuntu 22.04 repos seems to be functional
320-
# - GENIE's binaries link to pythia6 at runtime so we need to add the pythia6
321-
# library directory into the linker cache
322-
# - GENIE reads its configuration from files written into its source tree
323-
# (and not installed), so we need to keep its source tree around
324-
#
325-
# Some errors from the build configuration
326-
# - The 'quota: not found' error can be ignored. It is just saving a snapshot
327-
# of the build environment.
328-
# - The 'cant exec git' error is resolved within the perl script which
329-
# deduces the version from the files in the .git directory if git is
330-
# not installed.
331-
###############################################################################
332-
333-
# See https://github.com/LDMX-Software/docker/pull/48
334-
#
335-
# Note that libgsl-dev needs to be available already when building ROOT to build
336-
# GENIE
337-
RUN install-ubuntu-packages \
338-
liblog4cpp5-dev \
339-
libtool
340-
341-
342-
ENV GENIE_VERSION=3.02.00
343-
#ENV GENIE_REWEIGHT_VERSION=1_02_00
344-
ENV GENIE=/usr/local/src/GENIE/Generator
345-
#ENV GENIE_DOT_VERSION="$(sed 's,_,\.,g' <<< $GENIE_VERSION )"
346-
LABEL genie.version=${GENIE_VERSION}
347-
348-
RUN mkdir -p ${GENIE} &&\
349-
export ENV GENIE_GET_VERSION="$(echo ${GENVIE_VERSION} | sed 's,\.,_,g')" &&\
350-
${__wget} https://github.com/GENIE-MC/Generator/archive/refs/tags/R-${GENIE_GET_VERSION}.tar.gz |\
351-
${__untar_to} ${GENIE} &&\
352-
cd ${GENIE} &&\
353-
./configure \
354-
--enable-lhapdf6 \
355-
--disable-lhapdf5 \
356-
--enable-gfortran \
357-
--with-gfortran-lib=/usr/x86_64-linux-gnu/ \
358-
--disable-pythia8 \
359-
--with-pythia6-lib=${__prefix}/pythia6 \
360-
--enable-test \
361-
&& \
362-
make -j$NPROC && \
363-
make -j$NPROC install
364-
365-
366292
###############################################################################
367293
# Catch2
368294
###############################################################################

0 commit comments

Comments
 (0)