Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Merge requests
!48
Resolve "use Athena instead of reference_detector"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "use Athena instead of reference_detector"
56-use-athena-instead-of-reference_detector
into
master
Overview
0
Commits
1
Pipelines
0
Changes
2
Merged
Sylvester Joosten
requested to merge
56-use-athena-instead-of-reference_detector
into
master
4 years ago
Overview
0
Commits
1
Pipelines
0
Changes
2
Expand
Closes
#56 (closed)
Edited
4 years ago
by
Sylvester Joosten
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
e04d7cc2
1 commit,
4 years ago
2 files
+
9
−
10
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
containers/jug/Dockerfile.xl
+
8
−
9
Options
@@ -32,25 +32,25 @@ RUN cd /tmp
&& rm -rf build juggler
## also install detector/ip geometries into opt
## FIXME: need to add proper compact file install directly to the
reference
detector
## FIXME: need to add proper compact file install directly to the
athena
detector
## build
ARG DETECTOR_VERSION="master"
ARG IP6_VERSION="master"
ARG ACCELERATOR_VERSION="master"
RUN cd /tmp \
&& DETECTOR_PREFIX=/opt/detector \
&& DETECTOR_DATA=$DETECTOR_PREFIX/share/
reference_detector
\
&& mkdir -p /opt/detector/share/
reference_detector
\
&& DETECTOR_DATA=$DETECTOR_PREFIX/share/
athena
\
&& mkdir -p /opt/detector/share/
athena
\
&& echo "INSTALLING REFERENCE DETECTOR" \
&& git clone -b ${DETECTOR_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/
reference_detector.git
\
&& cmake -B build -S
reference_detector
-DCMAKE_CXX_STANDARD=17 \
https://eicweb.phy.anl.gov/EIC/detectors/
athena.git
\
&& cmake -B build -S
athena
-DCMAKE_CXX_STANDARD=17
\
-DCMAKE_INSTALL_PREFIX=${DETECTOR_PREFIX} \
&& cmake --build build -j12 -- install \
&& cp -r
reference_detector/compact
\
reference_detector/reference_detector.xml
\
&& cp -r
athena/compact
\
athena/athena.xml
\
${DETECTOR_DATA} \
&& rm -rf build
reference_detector
\
&& rm -rf build
athena
\
&& echo "INSTALLING IP6 GEOMETRY" \
&& git clone -b ${IP6_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \
@@ -63,4 +63,3 @@ RUN cd /tmp
&& echo "ADDING SETUP SCRIPT" \
&& echo "export LD_LIBRARY_PATH=/opt/detector/lib:\$LD_LIBRARY_PATH" \
> /opt/detector/setup.sh
Loading