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
1a903ae0
Commit
1a903ae0
authored
2 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: remove some unnecessary hacks
parent
228bfbb2
No related branches found
No related tags found
1 merge request
!554
feat: remove some unnecessary hacks
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
containers/jug/dev.Dockerfile
+2
-13
2 additions, 13 deletions
containers/jug/dev.Dockerfile
with
2 additions
and
13 deletions
containers/jug/dev.Dockerfile
+
2
−
13
View file @
1a903ae0
...
@@ -141,9 +141,7 @@ RUN --mount=type=cache,target=/var/cache/pip,sharing=locked,id=${TARGETPLATFORM}
...
@@ -141,9 +141,7 @@ RUN --mount=type=cache,target=/var/cache/pip,sharing=locked,id=${TARGETPLATFORM}
--no-warn-script-location
--no-warn-script-location
# ^ Supress not on PATH Warnings
# ^ Supress not on PATH Warnings
## Including some small fixes:
## Including some small fixes
## - Somehow PODIO env isn't automatically set,
## - and Gaudi likes BINARY_TAG to be set
RUN
cd
/opt/spack-environment
\
RUN
cd
/opt/spack-environment
\
&&
source
$SPACK_ROOT
/share/spack/setup-env.sh
\
&&
source
$SPACK_ROOT
/share/spack/setup-env.sh
\
&&
echo
-n
""
\
&&
echo
-n
""
\
...
@@ -151,16 +149,7 @@ RUN cd /opt/spack-environment \
...
@@ -151,16 +149,7 @@ RUN cd /opt/spack-environment \
&&
spack
env
activate
--sh
--dir
/opt/spack-environment/
${
ENV
}
\
&&
spack
env
activate
--sh
--dir
/opt/spack-environment/
${
ENV
}
\
|
sed
"s?LD_LIBRARY_PATH=?&/lib/x86_64-linux-gnu:?"
\
|
sed
"s?LD_LIBRARY_PATH=?&/lib/x86_64-linux-gnu:?"
\
|
sed
'/MANPATH/ s/;$/:;/'
\
|
sed
'/MANPATH/ s/;$/:;/'
\
>
/etc/profile.d/z10_spack_environment.sh
\
>
/etc/profile.d/z10_spack_environment.sh
&&
cd
/opt/spack-environment
\
&&
spack
env
activate
--dir
/opt/spack-environment/
${
ENV
}
\
&&
echo
-n
""
\
&&
echo
"Add extra environment variables for Jug, Podio and Gaudi"
\
&&
echo
"export PODIO=
$(
spack location
-i
podio
)
;"
\
>>
/etc/profile.d/z10_spack_environment.sh
\
&&
echo
-n
""
\
&&
echo
"Executing cmake patch for dd4hep 16.1"
\
&& sed -i "s/FIND_PACKAGE(Python/#&/" /usr/local/cmake/DD4hepBuild.cmake
## make sure we have the entrypoints setup correctly
## make sure we have the entrypoints setup correctly
ENTRYPOINT
[]
ENTRYPOINT
[]
...
...
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