extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-01-27 08:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #941 from HernandoR/patch-1

Browse Source 
Update podman_compose.py
This commit is contained in:
Muayyad Alsadi 2024-05-19 11:10:39 +03:00 committed by GitHub
commit 45efe461b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
podman_compose.py
View File

@ -1749,7 +1749,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.append(*include) files.extend(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.

6
tests/include/docker-compose.extend.yaml Normal file
View File

@ -0,0 +1,6 @@
version: '3.6'
services:
web2:
image: nopush/podman-compose-test
command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", ".", "-p", "8004"]

1
tests/include/docker-compose.yaml
View File

@ -2,3 +2,4 @@ version: '3.6'
include: include:
- docker-compose.base.yaml - docker-compose.base.yaml
- docker-compose.extend.yaml

2
tests/test_podman_compose_include.py
View File

@ -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') self.assertEqual(out, b'"localhost/nopush/podman-compose-test:latest"\n"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"")