Revert "fix compose not recognizing custom containerfile when in a git context"

This reverts commit df7aa40.

Signed-off-by: Metroite <[email protected]>

Author: metroite

podman_compose.py

@@ -2883,34 +2883,35 @@ def cleanup_temp_dockfile() -> None:
             cleanup_callbacks.append(cleanup_temp_dockfile)
 
     build_args = []
-
-    custom_dockerfile_given = False
-    if dockerfile:
-        dockerfile = os.path.join(ctx, dockerfile)
-        custom_dockerfile_given = True
-    else:
-        dockerfile_alts = [
-            "Containerfile",
-            "ContainerFile",
-            "containerfile",
-            "Dockerfile",
-            "DockerFile",
-            "dockerfile",
-        ]
-        for dockerfile in dockerfile_alts:
+    # if givent context was not recognized as git url, try joining paths to get a file locally
+    if not is_context_git_url(ctx):
+        custom_dockerfile_given = False
+        if dockerfile:
             dockerfile = os.path.join(ctx, dockerfile)
-            if path_exists(dockerfile):
-                break
+            custom_dockerfile_given = True
+        else:
+            dockerfile_alts = [
+                "Containerfile",
+                "ContainerFile",
+                "containerfile",
+                "Dockerfile",
+                "DockerFile",
+                "dockerfile",
+            ]
+            for dockerfile in dockerfile_alts:
+                dockerfile = os.path.join(ctx, dockerfile)
+                if path_exists(dockerfile):
+                    break
 
-    if path_exists(dockerfile):
-        # normalize dockerfile path, as the user could have provided unpredictable file formats
-        dockerfile = os.path.normpath(os.path.join(ctx, dockerfile))
-        build_args.extend(["-f", dockerfile])
-    else:
-        if custom_dockerfile_given:
-            # custom dockerfile name was also not found in the file system
-            raise OSError(f"Dockerfile not found in {dockerfile}")
-        raise OSError(f"Dockerfile not found in {ctx}")
+        if path_exists(dockerfile):
+            # normalize dockerfile path, as the user could have provided unpredictable file formats
+            dockerfile = os.path.normpath(os.path.join(ctx, dockerfile))
+            build_args.extend(["-f", dockerfile])
+        else:
+            if custom_dockerfile_given:
+                # custom dockerfile name was also not found in the file system
+                raise OSError(f"Dockerfile not found in {dockerfile}")
+            raise OSError(f"Dockerfile not found in {ctx}")
 
     build_args.extend(["-t", cnt["image"]])