summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-06-03 11:00:04 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-06-08 15:51:03 -0400
commita9cb824981db3fee6b8445b29e513c89e9b9b00b (patch)
tree3f5573508cd05e25044269d20f0436f4d9cfcb80 /test
parent9938557a53ed6599267ed1f8c0b6378499ab8e28 (diff)
downloadpodman-a9cb824981db3fee6b8445b29e513c89e9b9b00b.tar.gz
podman-a9cb824981db3fee6b8445b29e513c89e9b9b00b.tar.bz2
podman-a9cb824981db3fee6b8445b29e513c89e9b9b00b.zip
podman-remote build should handle -f option properly
podman-remote build has to handle multiple different locations for the Containerfile. Currently this works in local mode but not when using podman-remote. Fixes: https://github.com/containers/podman/issues/9871 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/system/070-build.bats26
1 files changed, 26 insertions, 0 deletions
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 0f3f3fa7f..40622d6cc 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -794,6 +794,32 @@ EOF
run_podman rmi -f build_test
}
+@test "podman build -f test " {
+ tmpdir=$PODMAN_TMPDIR/build-test
+ subdir=$tmpdir/subdir
+ mkdir -p $subdir
+
+ containerfile1=$tmpdir/Containerfile1
+ cat >$containerfile1 <<EOF
+FROM scratch
+copy . /tmp
+EOF
+ containerfile2=$PODMAN_TMPDIR/Containerfile2
+ cat >$containerfile2 <<EOF
+FROM $IMAGE
+EOF
+ run_podman build -t build_test -f Containerfile1 $tmpdir
+ run_podman 125 build -t build_test -f Containerfile2 $tmpdir
+ is "$output" ".*Containerfile2: no such file or directory" "Containerfile2 should not exist"
+ run_podman build -t build_test -f $containerfile1 $tmpdir
+ run_podman build -t build_test -f $containerfile2 $tmpdir
+ run_podman build -t build_test -f $containerfile1
+ run_podman build -t build_test -f $containerfile2
+ run_podman build -t build_test -f $containerfile1 -f $containerfile2 $tmpdir
+ is "$output" ".*$IMAGE" "Containerfile2 is also passed to server"
+ run_podman rmi -f build_test
+}
+
function teardown() {
# A timeout or other error in 'build' can leave behind stale images
# that podman can't even see and which will cascade into subsequent