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
46dd75a1
Commit
46dd75a1
authored
8 months ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
fix: mv spack gc to builder
parent
d7f4afa2
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!988
feat: remove staging layer in container build
This commit is part of merge request
!988
. Comments created here will be created in the context of that merge request.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
containers/jug/dev.Dockerfile
+2
-3
2 additions, 3 deletions
containers/jug/dev.Dockerfile
with
2 additions
and
3 deletions
containers/jug/dev.Dockerfile
+
2
−
3
Edit
View file @
46dd75a1
...
@@ -157,6 +157,7 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
...
@@ -157,6 +157,7 @@ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
SPACK_ENV=${SPACK_ENV} \
SPACK_ENV=${SPACK_ENV} \
BUILDCACHE_OCI_PROMPT="eicweb" \
BUILDCACHE_OCI_PROMPT="eicweb" \
BUILDCACHE_OCI_FINAL="ghcr"
BUILDCACHE_OCI_FINAL="ghcr"
spack gc --yes-to-all
spack find --long --no-groups \
spack find --long --no-groups \
| sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
| sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
| uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
| uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
...
@@ -208,6 +209,7 @@ spack concretize --fresh --force
...
@@ -208,6 +209,7 @@ spack concretize --fresh --force
make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
SPACK_ENV=${SPACK_ENV} \
SPACK_ENV=${SPACK_ENV} \
BUILDCACHE_OCI_FINAL="eicweb"
BUILDCACHE_OCI_FINAL="eicweb"
spack gc --yes-to-all
spack find --long --no-groups \
spack find --long --no-groups \
| sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
| sed -e '1,/Installed packages/d;s/\([^@]*\).*/\1/g' \
| uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
| uniq -D -f1 | grep -v -w -e "\(epic\|py-pip\|py-cython\)" \
...
@@ -253,9 +255,6 @@ WORKDIR /
...
@@ -253,9 +255,6 @@ WORKDIR /
## ========================================================================================
## ========================================================================================
FROM
builder
as
staging
FROM
builder
as
staging
# Garbage collect in environment
RUN
spack
-e
${
SPACK_ENV
}
gc
-y
# Garbage collect in git
# Garbage collect in git
#RUN git -C $SPACK_ROOT gc --prune=all --aggressive
#RUN git -C $SPACK_ROOT gc --prune=all --aggressive
...
...
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