From 4c5b79120c14b1a5cd80c04570f5ffaede773965 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 15 Feb 2023 04:10:49 +0200
Subject: [PATCH] Allow specification of podman --remote build -f -

Fixes: https://github.com/containers/podman/issues/17495

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/images/build.go | 6 +++++-
 test/system/070-build.bats | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index f4657e4daa..835e69b0f7 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -218,7 +218,11 @@ func build(cmd *cobra.Command, args []string) error {
 	var containerFiles []string
 	for _, f := range buildOpts.File {
 		if f == "-" {
-			containerFiles = append(containerFiles, "/dev/stdin")
+			if len(args) == 0 {
+				args = append(args, "-")
+			} else {
+				containerFiles = append(containerFiles, "/dev/stdin")
+			}
 		} else {
 			containerFiles = append(containerFiles, f)
 		}
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 9f77df92de..cfa7799371 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -101,6 +101,12 @@ EOF
     is "$output"   "$rand_content"   "reading generated file in image"
 
     run_podman rmi -f build_test
+
+    # Now try without specifying a context dir
+    run_podman build -t build_test -f - < $containerfile
+    is "$output" ".*COMMIT" "COMMIT seen in log"
+
+    run_podman rmi -f build_test
 }
 
 @test "podman build - global runtime flags test" {