From 5f51759b258d369acbfb7d90d6b82e58f099651e Mon Sep 17 00:00:00 2001 From: munishchouhan Date: Wed, 6 Sep 2023 17:52:52 +0200 Subject: [PATCH] spack entry point file name corrected --- .../resources/templates/spack/singularityfile-spack-file.txt | 2 +- .../src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wave-utils/src/main/resources/templates/spack/singularityfile-spack-file.txt b/wave-utils/src/main/resources/templates/spack/singularityfile-spack-file.txt index 297718e..842872b 100644 --- a/wave-utils/src/main/resources/templates/spack/singularityfile-spack-file.txt +++ b/wave-utils/src/main/resources/templates/spack/singularityfile-spack-file.txt @@ -11,7 +11,7 @@ stage: final mkdir -p /.singularity.d/env cp -p /opt/spack-env/z10_spack_environment.sh /.singularity.d/env/91-environment.sh echo "#!/usr/bin/env bash\n\nset -ef -o pipefail\nsource /opt/spack-env/z10_spack_environment.sh\nexec \"\$@\"" \ - >/opt/spack-env/spack_docker_entrypoint.sh && chmod a+x /opt/spack-env/spack_docker_entrypoint.sh + >/opt/spack-env/spack_entrypoint.sh && chmod a+x /opt/spack-env/spack_entrypoint.sh {{add_commands}} %runscript diff --git a/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy b/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy index a3c20f1..3a14cc2 100644 --- a/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy +++ b/wave-utils/src/test/groovy/io/seqera/wave/util/DockerHelperTest.groovy @@ -798,7 +798,7 @@ class DockerHelperTest extends Specification { mkdir -p /.singularity.d/env cp -p /opt/spack-env/z10_spack_environment.sh /.singularity.d/env/91-environment.sh echo "#!/usr/bin/env bash\\n\\nset -ef -o pipefail\\nsource /opt/spack-env/z10_spack_environment.sh\\nexec \\"\\$@\\"" \\ - >/opt/spack-env/spack_docker_entrypoint.sh && chmod a+x /opt/spack-env/spack_docker_entrypoint.sh + >/opt/spack-env/spack_entrypoint.sh && chmod a+x /opt/spack-env/spack_entrypoint.sh USER hola %runscript