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
d3af1b27
Commit
d3af1b27
authored
1 year ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: use ld.so.conf.d to add paths
parent
9cae68ac
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!856
feat: use ld.so.conf.d to add paths
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/jug/dev.Dockerfile
+7
-0
7 additions, 0 deletions
containers/jug/dev.Dockerfile
containers/jug/profile.d/z11_jug_env.sh
+0
-3
0 additions, 3 deletions
containers/jug/profile.d/z11_jug_env.sh
with
7 additions
and
3 deletions
containers/jug/dev.Dockerfile
+
7
−
0
View file @
d3af1b27
...
...
@@ -314,6 +314,13 @@ EOF
## set ROOT TFile forward compatibility
RUN
sed
-i
's/# \(TFile.v630forwardCompatibility:\) no/\1 yes/'
/usr/local/etc/root/system.rootrc
## Setup ld.so.conf with what could go in LD_LIBRARY_PATH (but lower priority)
## Ref: https://man7.org/linux/man-pages/man8/ld.so.8.html
COPY
<<EOF /etc/ld.so.conf.d/eic-shell.conf
/usr/local/lib/root
EOF
RUN
ldconfig
## set the local spack configuration
ENV
SPACK_DISABLE_LOCAL_CONFIG="true"
RUN
<<
EOF
...
...
This diff is collapsed.
Click to expand it.
containers/jug/profile.d/z11_jug_env.sh
+
0
−
3
View file @
d3af1b27
#!/bin/bash
# FIXME: add ROOT libraries to LD_LIBRARY_PATH until removal can be tested
export
LD_LIBRARY_PATH
=
$LD_LIBRARY_PATH
:/usr/local/lib/root
if
[
!
-z
${
EIC_SHELL_PREFIX
}
]
;
then
if
[
"
$LD_LIBRARY_PATH
"
!=
*
"
${
EIC_SHELL_PREFIX
}
/lib"
*
]
;
then
export
LD_LIBRARY_PATH
=
$EIC_SHELL_PREFIX
/lib
${
LD_LIBRARY_PATH
:+:
$LD_LIBRARY_PATH
}
...
...
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