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
b7da320f
Commit
b7da320f
authored
2 years ago
by
Ujwal Kundur
Browse files
Options
Downloads
Patches
Plain Diff
Add Fortan support required by root and few other packages
parent
d91679ac
No related branches found
No related tags found
1 merge request
!306
OneAPI Integration Testing
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/oneapi/onedev.Dockerfile
+6
-5
6 additions, 5 deletions
containers/oneapi/onedev.Dockerfile
spack.yaml
+2
-2
2 additions, 2 deletions
spack.yaml
with
8 additions
and
7 deletions
containers/oneapi/onedev.Dockerfile
+
6
−
5
View file @
b7da320f
...
...
@@ -8,7 +8,6 @@
## ========================================================================================
FROM
intel/oneapi-hpckit:2022.1.2-devel-ubuntu18.04
AS
oneapi
...
...
@@ -39,6 +38,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
file
\
build-essential
\
gdb
\
gfortran
\
ghostscript
\
git
\
gnupg2
\
...
...
@@ -142,6 +142,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
&&
spack mirror add docker /var/cache/spack-mirror
\
&&
spack mirror list
## This variable will change whenevery either spack.yaml or our spack package
## overrides change, triggering a rebuild
ARG
CACHE_BUST="hash"
ARG
CACHE_NUKE=""
## Setup our custom environment and package overrides
COPY
spack $SPACK_ROOT/eic-spack
RUN
spack repo add
--scope
site
"
$SPACK_ROOT
/eic-spack"
\
...
...
@@ -152,10 +157,6 @@ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \
&&
spack
env
activate
.
\
&&
spack concretize
## This variable will change whenevery either spack.yaml or our spack package
## overrides change, triggering a rebuild
ARG
CACHE_BUST="hash"
ARG
CACHE_NUKE=""
## Now execute the main build (or fetch from cache if possible)
## note, no-check-signature is needed to allow the quicker signature-less
...
...
This diff is collapsed.
Click to expand it.
spack.yaml
+
2
−
2
View file @
b7da320f
...
...
@@ -50,8 +50,8 @@ spack:
paths
:
cc
:
/usr/bin/gcc
cxx
:
/usr/bin/g++
f77
:
fc
:
f77
:
/usr/bin/gfortran
fc
:
/usr/bin/gfortran
flags
:
{}
operating_system
:
ubuntu18.04
target
:
x86_64
...
...
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