Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

force podman-remote to use Dockerfile, #2086

Merged
merged 1 commit into from
Nov 8, 2023
Merged

force podman-remote to use Dockerfile, #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions atomic_reactor/tasks/binary_container_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions tests/tasks/test_binary_container_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
Loading