containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17506 from rhatdan/build 

Allow specification of podman --remote build -f -
This commit is contained in:
OpenShift Merge Robot 2023-02-15 09:13:05 -05:00 committed by GitHub
parent 8a3f5cfbc2 4c5b79120c
commit 83757ccb55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/images/build.go
View File

@ -218,7 +218,11 @@ func build(cmd *cobra.Command, args []string) error {
var containerFiles []string var containerFiles []string
for _, f := range buildOpts.File { for _, f := range buildOpts.File {
if f == "-" { if f == "-" {
containerFiles = append(containerFiles, "/dev/stdin") if len(args) == 0 {
args = append(args, "-")
} else {
containerFiles = append(containerFiles, "/dev/stdin")
}
} else { } else {
containerFiles = append(containerFiles, f) containerFiles = append(containerFiles, f)
} }

6
test/system/070-build.bats
View File

@ -101,6 +101,12 @@ EOF
is "$output" "$rand_content" "reading generated file in image" is "$output" "$rand_content" "reading generated file in image"
run_podman rmi -f build_test 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" { @test "podman build - global runtime flags test" {