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
Commits
9d8adca9
Commit
9d8adca9
authored
3 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
Removed accelerator repo and added setup script
parent
02e9a1fc
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!46
Removed accelerator repo and added setup script
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-4
2 additions, 4 deletions
.gitlab-ci.yml
containers/jug/Dockerfile.xl
+5
-7
5 additions, 7 deletions
containers/jug/Dockerfile.xl
with
7 additions
and
11 deletions
.gitlab-ci.yml
+
2
−
4
View file @
9d8adca9
...
@@ -5,9 +5,8 @@ variables:
...
@@ -5,9 +5,8 @@ variables:
JUGGLER_VERSION
:
"
v1.6.0"
JUGGLER_VERSION
:
"
v1.6.0"
NPDET_VERSION
:
"
v0.5.0"
NPDET_VERSION
:
"
v0.5.0"
EICD_VERSION
:
"
v0.1.0"
EICD_VERSION
:
"
v0.1.0"
DETECTOR_VERSION
:
"
v0.1.0"
DETECTOR_VERSION
:
"
v0.2.0"
IP6_VERSION
:
"
v0.1.0"
IP6_VERSION
:
"
v0.2.0"
ACCELERATOR_VERSION
:
"
master"
#needs to be merged into IP6
## Spack github version
## Spack github version
SPACK_VERSION
:
"
63915de99b6d4bc7c8b8a22dc45e5c3dd7ee4f26"
SPACK_VERSION
:
"
63915de99b6d4bc7c8b8a22dc45e5c3dd7ee4f26"
...
@@ -201,7 +200,6 @@ jug_xl:default:
...
@@ -201,7 +200,6 @@ jug_xl:default:
--build-arg EICD_VERSION=${EICD_VERSION}
--build-arg EICD_VERSION=${EICD_VERSION}
--build-arg DETECTOR_VERSION=${DETECTOR_VERSION}
--build-arg DETECTOR_VERSION=${DETECTOR_VERSION}
--build-arg IP6_VERSION=${IP6_VERSION}
--build-arg IP6_VERSION=${IP6_VERSION}
--build-arg ACCELERATOR_VERSION=${ACCELERATOR_VERSION}
containers/jug
containers/jug
-
!reference
[
.build
,
script
]
-
!reference
[
.build
,
script
]
...
...
This diff is collapsed.
Click to expand it.
containers/jug/Dockerfile.xl
+
5
−
7
View file @
9d8adca9
...
@@ -51,12 +51,6 @@ RUN cd /tmp
...
@@ -51,12 +51,6 @@ RUN cd /tmp
reference_detector/reference_detector.xml \
reference_detector/reference_detector.xml \
${DETECTOR_DATA} \
${DETECTOR_DATA} \
&& rm -rf build reference_detector \
&& rm -rf build reference_detector \
&& echo "INSTALLING ACCELERATOR GEOMETRY" \
&& git clone -b ${ACCELERATOR_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git \
&& cp -r accelerator/eic \
${DETECTOR_DATA} \
&& rm -rf accelerator \
&& echo "INSTALLING IP6 GEOMETRY" \
&& echo "INSTALLING IP6 GEOMETRY" \
&& git clone -b ${IP6_VERSION} \
&& git clone -b ${IP6_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \
https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \
...
@@ -65,4 +59,8 @@ RUN cd /tmp
...
@@ -65,4 +59,8 @@ RUN cd /tmp
&& cmake --build build -j12 -- install \
&& cmake --build build -j12 -- install \
&& cp -r ip6/ip6 \
&& cp -r ip6/ip6 \
${DETECTOR_DATA} \
${DETECTOR_DATA} \
&& rm -rf build ip6
&& rm -rf build ip6 \
&& echo "ADDING SETUP SCRIPT" \
&& echo "export LD_LIBRARY_PATH=/opt/detector/lib:\$LD_LIBRARY_PATH" \
> /opt/detector/setup.sh
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment