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
!16
New feature version
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
New feature version
develop
into
master
Overview
0
Commits
25
Pipelines
0
Changes
60
Merged
Sylvester Joosten
requested to merge
develop
into
master
4 years ago
Overview
0
Commits
25
Pipelines
0
Changes
60
Expand
Upgraded ACTS to v3.00.0
Added spack package overrides directly to this repo for transparency
Refactored CI:
Got rid of staging step which was somewhat redundant
Streamlined CI script to get rid of all almost duplicate pipeline steps
Use rules to automatically build on master, develop, tags and merge-requests
Detect if we can use the docker cache, or if we need to start over clean.
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
84eb4507
25 commits,
4 years ago
60 files
+
4405
−
208
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
60
Search (e.g. *.vue) (Ctrl+P)
containers/builder/Dockerfile
+
4
−
22
Options
@@ -28,14 +28,13 @@ RUN apt-get -yqq update \
COPY
spack.yaml /opt/spack-environment/spack.yaml
## Ensure an up-to-date custom package list
## TODO: We should just remove this from the upstream container
## and only initialize the custom packages here for more
## transparency
RUN
rm
-rf
$SPACK_ROOT
/np-spack
\
&&
git clone https://eicweb.phy.anl.gov/EIC/np-spack.git
$SPACK_ROOT
/np-spack
\
&&
cd
$SPACK_ROOT
/np-spack
\
&&
git checkout v
$(
spack
--version
)
\
&&
cd
-
\
&&
echo
"DISABLED: rm -rf
$SPACK_ROOT
/np-spack/.git"
\
&&
echo
"repos:"
>
$SPACK_ROOT
/etc/spack/repos.yaml
\
&&
echo
" -
$SPACK_ROOT
/np-spack"
>>
$SPACK_ROOT
/etc/spack/repos.yaml
COPY
np-spack $SPACK_ROOT/np-spack
## Install the software, no garbage collection at this stage
## as this is a raw builder image
@@ -51,23 +50,6 @@ RUN cd /opt/spack-environment && spack env activate . \
--no-cache-dir
\
ipython matplotlib scipy yapf
## --> disabled for now as we are changing them by the hour
## Build elements prone to change here, to allow us to rebuild
## from runner cache efficiently
#RUN cd /opt/spack-environment \
#&& spack env activate . \
#&& spack add npdet@master \
#&& spack add eicd@master \
#&& spack install \
#&& spack clean -a
## Strip the binaries/DISABLED for builder, do this for release step
#RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \
# xargs file -i | \
# grep 'charset=binary' | \
# grep 'x-executable\|x-archive\|x-sharedlib' | \
# awk -F: '{print $1}' | xargs strip -s
# Modifications to the environment that are necessary to run
# Also make sure we keep the /lib/x86_65-linux-gnu in our PATH
RUN
cd
/opt/spack-environment
\
Loading