diff options
| author | Vanessasaurus <814322+vsoch@users.noreply.github.com> | 2021-08-23 23:48:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 05:48:16 +0000 |
| commit | 5823a9b302b9786d64f918a0b5e5143229ffe96b (patch) | |
| tree | 63470aabc7cc760c30c51baf75f19832c5ef5f45 | |
| parent | 01cbf3b81c9e0db2beb32036980140fdc4e16197 (diff) | |
| download | spack-5823a9b302b9786d64f918a0b5e5143229ffe96b.tar.gz spack-5823a9b302b9786d64f918a0b5e5143229ffe96b.tar.bz2 spack-5823a9b302b9786d64f918a0b5e5143229ffe96b.tar.xz spack-5823a9b302b9786d64f918a0b5e5143229ffe96b.zip | |
fixing small bug that a line of spack monitor commands are still produced (#25366)
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
Co-authored-by: vsoch <vsoch@users.noreply.github.com>
| -rw-r--r-- | share/spack/templates/container/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile index 875702979d..c23ad64188 100644 --- a/share/spack/templates/container/Dockerfile +++ b/share/spack/templates/container/Dockerfile @@ -14,7 +14,10 @@ RUN mkdir {{ paths.environment }} \ {{ manifest }} > {{ paths.environment }}/spack.yaml # Install the software, remove unnecessary deps -RUN {% if monitor.enabled %}--mount=type=secret,id=su --mount=type=secret,id=st{% endif %} cd {{ paths.environment }} && spack env activate . {% if not monitor.disable_auth %}&& export SPACKMON_USER=$(cat /run/secrets/su) && export SPACKMON_TOKEN=$(cat /run/secrets/st) {% endif %}&& spack install {% if monitor.enabled %}--monitor {% if monitor.prefix %}--monitor-prefix {{ monitor.prefix }} {% endif %}{% if monitor.tags %}--monitor-tags {{ monitor.tags }} {% endif %}{% if monitor.keep_going %}--monitor-keep-going {% endif %}{% if monitor.host %}--monitor-host {{ monitor.host }} {% endif %}{% if monitor.disable_auth %}--monitor-disable-auth {% endif %}{% endif %}--fail-fast && spack gc -y +RUN {% if monitor.enabled %}--mount=type=secret,id=su --mount=type=secret,id=st {% endif %}cd {{ paths.environment }} && \ + spack env activate . {% if monitor.enabled %}{% if not monitor.disable_auth %}&& export SPACKMON_USER=$(cat /run/secrets/su) && export SPACKMON_TOKEN=$(cat /run/secrets/st) {% endif %}{% endif %}&& \ + spack install {% if monitor.enabled %}--monitor {% if monitor.prefix %}--monitor-prefix {{ monitor.prefix }} {% endif %}{% if monitor.tags %}--monitor-tags {{ monitor.tags }} {% endif %}{% if monitor.keep_going %}--monitor-keep-going {% endif %}{% if monitor.host %}--monitor-host {{ monitor.host }} {% endif %}{% if monitor.disable_auth %}--monitor-disable-auth {% endif %}{% endif %}--fail-fast && \ + spack gc -y {% if strip %} # Strip all the binaries |