hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Containerize: accommodate nested or pre-existing spack-env paths (#41558)

Browse source 
The current `mkdir {{ paths.environment }}` will generate an error if:
* `{{ paths.environment }}` already exists, or
* `{{ paths.environment }}` is nested in non-existing dirs.

Adding `-p` to the command will make this robust to both possibilities.

Set noclobber bash option when writing manifest.
This commit is contained in:
Owen Solberg 2024-01-11 09:47:10 -08:00 committed by GitHub
parent 49307b6cb2
commit 4022f083d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
share/spack/templates/container/Dockerfile
View file

@ -16,7 +16,8 @@ RUN {% if os_package_update %}{{ os_packages_build.update }} \
# What we want to install and how we want to install it # What we want to install and how we want to install it
# is specified in a manifest file (spack.yaml) # is specified in a manifest file (spack.yaml)
RUN mkdir {{ paths.environment }} \ RUN mkdir -p {{ paths.environment }} && \
set -o noclobber \
{{ manifest }} > {{ paths.environment }}/spack.yaml {{ manifest }} > {{ paths.environment }}/spack.yaml
# Install the software, remove unnecessary deps # Install the software, remove unnecessary deps