Merge pull request #978 from PlugNPush/main

Restore support for alt dockerfiles (removing hardcoded "Dockerfile")
containers · Jun 26, 2024 · d9a3572 · d9a3572
2 parents 0bcf079 + fa3e0a7
commit d9a3572
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/newsfragments/978.bugfix b/newsfragments/978.bugfix
@@ -0,0 +1 @@
+Fixed support for de-facto alternative `Dockerfile` names (e.g. `Containerfile`)
diff --git a/podman_compose.py b/podman_compose.py
@@ -1527,12 +1527,8 @@ def normalize_service_final(service: dict, project_dir: str) -> dict:
         build = service["build"]
         context = build if is_str(build) else build.get("context", ".")
         context = os.path.normpath(os.path.join(project_dir, context))
-        dockerfile = (
-            "Dockerfile" if is_str(build) else service["build"].get("dockerfile", "Dockerfile")
-        )
         if not is_dict(service["build"]):
             service["build"] = {}
-        service["build"]["dockerfile"] = dockerfile
         service["build"]["context"] = context
     return service
 

diff --git a/tests/unit/test_normalize_final_build.py b/tests/unit/test_normalize_final_build.py
@@ -22,15 +22,14 @@ class TestNormalizeFinalBuild(unittest.TestCase):
         (
             {"build": "."},
             {
-                "build": {"context": cwd, "dockerfile": "Dockerfile"},
+                "build": {"context": cwd},
             },
         ),
         (
             {"build": "../relative"},
             {
                 "build": {
                     "context": os.path.normpath(os.path.join(cwd, "../relative")),
-                    "dockerfile": "Dockerfile",
                 },
             },
         ),
@@ -39,7 +38,6 @@ class TestNormalizeFinalBuild(unittest.TestCase):
             {
                 "build": {
                     "context": os.path.normpath(os.path.join(cwd, "./relative")),
-                    "dockerfile": "Dockerfile",
                 },
             },
         ),
@@ -48,7 +46,6 @@ class TestNormalizeFinalBuild(unittest.TestCase):
             {
                 "build": {
                     "context": "/workspace/absolute",
-                    "dockerfile": "Dockerfile",
                 },
             },
         ),
@@ -74,7 +71,6 @@ class TestNormalizeFinalBuild(unittest.TestCase):
             {
                 "build": {
                     "context": cwd,
-                    "dockerfile": "Dockerfile",
                 },
             },
         ),
@@ -135,32 +131,31 @@ def test_parse_compose_file_when_single_compose(self, input, expected):
         (
             {},
             {"build": "."},
-            {"build": {"context": cwd, "dockerfile": "Dockerfile"}},
+            {"build": {"context": cwd}},
         ),
         (
             {"build": "."},
             {},
-            {"build": {"context": cwd, "dockerfile": "Dockerfile"}},
+            {"build": {"context": cwd}},
         ),
         (
             {"build": "/workspace/absolute"},
             {"build": "./relative"},
             {
                 "build": {
                     "context": os.path.normpath(os.path.join(cwd, "./relative")),
-                    "dockerfile": "Dockerfile",
                 }
             },
         ),
         (
             {"build": "./relative"},
             {"build": "/workspace/absolute"},
-            {"build": {"context": "/workspace/absolute", "dockerfile": "Dockerfile"}},
+            {"build": {"context": "/workspace/absolute"}},
         ),
         (
             {"build": "./relative"},
             {"build": "/workspace/absolute"},
-            {"build": {"context": "/workspace/absolute", "dockerfile": "Dockerfile"}},
+            {"build": {"context": "/workspace/absolute"}},
         ),
         (
             {"build": {"dockerfile": "test-dockerfile"}},
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed support for de-facto alternative `Dockerfile` names (e.g. `Containerfile`)