diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/container/writers/docker.py | 9 | ||||
| -rw-r--r-- | lib/spack/spack/test/container/docker.py | 13 |
2 files changed, 19 insertions, 3 deletions
diff --git a/lib/spack/spack/container/writers/docker.py b/lib/spack/spack/container/writers/docker.py index d2ac97b345..5b10ed6a93 100644 --- a/lib/spack/spack/container/writers/docker.py +++ b/lib/spack/spack/container/writers/docker.py @@ -2,6 +2,8 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import shlex + import spack.tengine as tengine from . import PathContext, writer @@ -17,14 +19,15 @@ class DockerContext(PathContext): @tengine.context_property def manifest(self): manifest_str = super(DockerContext, self).manifest - # Docker doesn't support HEREDOC so we need to resort to + # Docker doesn't support HEREDOC, so we need to resort to # a horrible echo trick to have the manifest in the Dockerfile echoed_lines = [] for idx, line in enumerate(manifest_str.split("\n")): + quoted_line = shlex.quote(line) if idx == 0: - echoed_lines.append('&& (echo "' + line + '" \\') + echoed_lines.append("&& (echo " + quoted_line + " \\") continue - echoed_lines.append('&& echo "' + line + '" \\') + echoed_lines.append("&& echo " + quoted_line + " \\") echoed_lines[-1] = echoed_lines[-1].replace(" \\", ")") diff --git a/lib/spack/spack/test/container/docker.py b/lib/spack/spack/test/container/docker.py index d6edca99a6..d6b6f4488b 100644 --- a/lib/spack/spack/test/container/docker.py +++ b/lib/spack/spack/test/container/docker.py @@ -2,6 +2,8 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import re + import pytest import spack.container.writers as writers @@ -149,3 +151,14 @@ def test_not_stripping_all_symbols(minimal_configuration): content = writers.create(minimal_configuration)() assert "xargs strip" in content assert "xargs strip -s" not in content + + +@pytest.mark.regression("22341") +def test_using_single_quotes_in_dockerfiles(minimal_configuration): + """Tests that Dockerfiles written by Spack use single quotes in manifest, to avoid issues + with shell substitution. This may happen e.g. when users have "definitions:" they want to + expand in dockerfiles. + """ + manifest_in_docker = writers.create(minimal_configuration).manifest + assert not re.search(r"echo\s*\"", manifest_in_docker, flags=re.MULTILINE) + assert re.search(r"echo\s*'", manifest_in_docker) |