Revert "Update podman_compose.py"
This commit is contained in:
parent
5d4de80ab7
commit
0f59707e26
|
|
@ -1816,7 +1816,7 @@ class PodmanCompose:
|
||||||
# If `include` is used, append included files to files
|
# If `include` is used, append included files to files
|
||||||
include = compose.get("include", None)
|
include = compose.get("include", None)
|
||||||
if include:
|
if include:
|
||||||
files.extend(include)
|
files.append(*include)
|
||||||
# As compose obj is updated and tested with every loop, not deleting `include`
|
# As compose obj is updated and tested with every loop, not deleting `include`
|
||||||
# from it, results in it being tested again and again, original values for
|
# from it, results in it being tested again and again, original values for
|
||||||
# `include` be appended to `files`, and, included files be processed for ever.
|
# `include` be appended to `files`, and, included files be processed for ever.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
version: '3.6'
|
|
||||||
|
|
||||||
services:
|
|
||||||
web2:
|
|
||||||
image: nopush/podman-compose-test
|
|
||||||
command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", ".", "-p", "8004"]
|
|
||||||
|
|
@ -2,4 +2,3 @@ version: '3.6'
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- docker-compose.base.yaml
|
- docker-compose.base.yaml
|
||||||
- docker-compose.extend.yaml
|
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ class TestPodmanComposeInclude(unittest.TestCase, RunSubprocessMixin):
|
||||||
|
|
||||||
self.run_subprocess_assert_returncode(command_up)
|
self.run_subprocess_assert_returncode(command_up)
|
||||||
out, _ = self.run_subprocess_assert_returncode(command_check_container)
|
out, _ = self.run_subprocess_assert_returncode(command_check_container)
|
||||||
self.assertEqual(out, b'"localhost/nopush/podman-compose-test:latest"\n"localhost/nopush/podman-compose-test:latest"\n')
|
self.assertEqual(out, b'"localhost/nopush/podman-compose-test:latest"\n')
|
||||||
# Get container ID to remove it
|
# Get container ID to remove it
|
||||||
out, _ = self.run_subprocess_assert_returncode(command_container_id)
|
out, _ = self.run_subprocess_assert_returncode(command_container_id)
|
||||||
self.assertNotEqual(out, b"")
|
self.assertNotEqual(out, b"")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue