diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-09 09:28:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-09 09:28:52 -0400 |
commit | 2970e3518cc95910444903f572418f5887316e47 (patch) | |
tree | a3fc16ba6afaa54b58634a65e1b091ed198cfcf7 /test/system | |
parent | c75d62c9877f56f6cc6253087b75ab05b8e4eac5 (diff) | |
parent | a9cb824981db3fee6b8445b29e513c89e9b9b00b (diff) | |
download | podman-2970e3518cc95910444903f572418f5887316e47.tar.gz podman-2970e3518cc95910444903f572418f5887316e47.tar.bz2 podman-2970e3518cc95910444903f572418f5887316e47.zip |
Merge pull request #10550 from rhatdan/Dockerfile
podman-remote build should handle -f option properly
Diffstat (limited to 'test/system')
-rw-r--r-- | test/system/070-build.bats | 26 |
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 |