Skip to content
Snippets Groups Projects
Commit 46dd75a1 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: mv spack gc to builder

parent d7f4afa2
Branches
Tags
1 merge request!988feat: 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.
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment