for podman-remote to use Dockerfile,

because in case Containerfile exists as well, it will use that instead * STONEBLD-1929 Signed-off-by: Robert Cerven <rcerven@redhat.com>
containerbuildsystem · Nov 7, 2023 · 0e45150 · 0e45150
1 parent ed80d31
commit 0e45150
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/atomic_reactor/tasks/binary_container_build.py b/atomic_reactor/tasks/binary_container_build.py
@@ -257,6 +257,8 @@ def build_container(
             f"--tag={dest_tag}",
             "--no-cache",  # make sure the build uses a clean environment
             "--pull-always",  # as above
+            # ensure that Dockerfile is always used even when Containerfile exists
+            "--file=Dockerfile",
         ]
         if memory_limit:
             # memory limit (format: <number>[<unit>], where unit = b, k, m or g)

diff --git a/tests/tasks/test_binary_container_build.py b/tests/tasks/test_binary_container_build.py
@@ -473,6 +473,7 @@ def test_build_container(self, authfile, is_flatpak, x86_build_dir, memory_limit
             f"--tag={X86_UNIQUE_IMAGE}",
             "--no-cache",
             "--pull-always",
+            "--file=Dockerfile",
         ]
         if memory_limit:
             options.append(f"--memory={memory_limit}")