root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
buildah/tests/add.bats

284 lines
10 KiB
Plaintext
Raw Permalink Normal View History

Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
#!/usr/bin/env bats
load helpers
Add flags/arguments order verification to other commands This is the third part of adding flags/args order verficiation. In this part I am adding it to command lines that take no arguments or more than 1 arguments such as buildah-images. Added tests too to verify it works correctly. Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com> Closes: #1002 Approved by: rhatdan
2018-09-09 22:44:05 +08:00
@test "add-flags-order-verification" {
Return exit code from failed containers Buildah run was exiting with the correct exit code, when a container failed. Buildah bud was not, so this should fix this. Also switched to the proper exit codes when containers fail. When Buildah fails to execute it will exit with a 125 exit code like Podman does. If a command fails to execute inside of a container we will exit with a 126. Currently we do not support the 127 for exiting when the command does not exist. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-16 21:48:43 +08:00
run_buildah 125 add container1 -q /tmp/container1
Add flags/arguments order verification to other commands This is the third part of adding flags/args order verficiation. In this part I am adding it to command lines that take no arguments or more than 1 arguments such as buildah-images. Added tests too to verify it works correctly. Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com> Closes: #1002 Approved by: rhatdan
2018-09-09 22:44:05 +08:00
check_options_flag_err "-q"
Return exit code from failed containers Buildah run was exiting with the correct exit code, when a container failed. Buildah bud was not, so this should fix this. Also switched to the proper exit codes when containers fail. When Buildah fails to execute it will exit with a 125 exit code like Podman does. If a command fails to execute inside of a container we will exit with a 126. Currently we do not support the 127 for exiting when the command does not exist. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-16 21:48:43 +08:00
run_buildah 125 add container1 --chown /tmp/container1 --quiet
Add flags/arguments order verification to other commands This is the third part of adding flags/args order verficiation. In this part I am adding it to command lines that take no arguments or more than 1 arguments such as buildah-images. Added tests too to verify it works correctly. Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com> Closes: #1002 Approved by: rhatdan
2018-09-09 22:44:05 +08:00
check_options_flag_err "--chown"
Return exit code from failed containers Buildah run was exiting with the correct exit code, when a container failed. Buildah bud was not, so this should fix this. Also switched to the proper exit codes when containers fail. When Buildah fails to execute it will exit with a 125 exit code like Podman does. If a command fails to execute inside of a container we will exit with a 126. Currently we do not support the 127 for exiting when the command does not exist. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-16 21:48:43 +08:00
run_buildah 125 add container1 /tmp/container1 --quiet
Add flags/arguments order verification to other commands This is the third part of adding flags/args order verficiation. In this part I am adding it to command lines that take no arguments or more than 1 arguments such as buildah-images. Added tests too to verify it works correctly. Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com> Closes: #1002 Approved by: rhatdan
2018-09-09 22:44:05 +08:00
check_options_flag_err "--quiet"
}
Fixup cleanliness in tests Clean up the tests so that data files that we generate don't get dropped in the root directory of the host, or in a part of ${TMPDIR} that we won't clean up. Add tests to exercise "add"'s extracting logic. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-08 04:54:51 +08:00
@test "add-local-plain" {
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
createrandom ${TESTDIR}/randomfile
createrandom ${TESTDIR}/other-randomfile
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --signature-policy ${TESTSDIR}/policy.json scratch
cid=$output
run_buildah mount $cid
root=$output
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
mkdir $root/subdir $root/other-subdir
# Copy a file to the working directory
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah config --workingdir=/ $cid
run_buildah add $cid ${TESTDIR}/randomfile
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
# Copy a file to a specific subdirectory
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah add $cid ${TESTDIR}/randomfile /subdir
Tweak ADDing/COPYing directories to copy contents When copying or adding a source directory, copy the directory's contents to the destination directory, to better match Dockerfile COPY behavior. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Closes: #50 Approved by: rhatdan
2017-03-28 15:02:41 +08:00
# Copy two files to a specific subdirectory
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah add $cid ${TESTDIR}/randomfile ${TESTDIR}/other-randomfile /other-subdir
Use pipes for copying Use the copier package to rework how we handle ADD and COPY. When evaluating cache for content that's being copied/added in, switch from (digest the data, check for a cache entry, then maybe copy the data and create the new layer) to (copy the data and create the new layer, digesting as we go, check for a cache entry, either commit or discard the new layer). Use the copier package for ADD, COPY, and for ensuring that a specified directory exists in the working container's rootfs. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-07-25 22:10:03 +08:00
# Copy two files to a specific location, which succeeds because we can create it as a directory.
run_buildah add $cid ${TESTDIR}/randomfile ${TESTDIR}/other-randomfile /notthereyet-subdir
Tweak ADDing/COPYing directories to copy contents When copying or adding a source directory, copy the directory's contents to the destination directory, to better match Dockerfile COPY behavior. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Closes: #50 Approved by: rhatdan
2017-03-28 15:02:41 +08:00
# Copy two files to a specific location, which fails because it's not a directory.
Use pipes for copying Use the copier package to rework how we handle ADD and COPY. When evaluating cache for content that's being copied/added in, switch from (digest the data, check for a cache entry, then maybe copy the data and create the new layer) to (copy the data and create the new layer, digesting as we go, check for a cache entry, either commit or discard the new layer). Use the copier package for ADD, COPY, and for ensuring that a specified directory exists in the working container's rootfs. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-07-25 22:10:03 +08:00
run_buildah 125 add $cid ${TESTDIR}/randomfile ${TESTDIR}/other-randomfile /randomfile
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
# Copy a file to a different working directory
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah config --workingdir=/cwd $cid
run_buildah add $cid ${TESTDIR}/randomfile
run_buildah unmount $cid
run_buildah commit --signature-policy ${TESTSDIR}/policy.json $cid containers-storage:new-image
run_buildah rm $cid
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
BATS major cleanup: part 4: manual stuff This is the manual part of the cleanup. - remove most 'buildah rm's from cleanup steps - remove unused variables - use expect_output when possible, not 'test [ x = y ]' - includes fixing some not-what-you-think-it-is uses of run_buildah | grep - be careful not to leave droppings in current directory Special attention to: - authenticate.bats: create Dockerfile in temp dir, not pwd! - push.bats: remove broken output check - registries.bats: refactor, remove duplicate tests & code - rmi.bats: better checking of messages - secrets.bats: use TESTDIR (tmp), not TESTSDIR (/usr/share) ! We don't want to leave droppings behind if we fail; this has bitten us before. And, since there's only one test, there's no need to override setup() / teardown(). Do setup inline, and take advantage of existing defaults. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 07:21:51 +08:00
run_buildah from --signature-policy ${TESTSDIR}/policy.json new-image
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
newcid=$output
run_buildah mount $newcid
newroot=$output
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $newroot/randomfile
cmp ${TESTDIR}/randomfile $newroot/randomfile
test -s $newroot/subdir/randomfile
cmp ${TESTDIR}/randomfile $newroot/subdir/randomfile
test -s $newroot/other-subdir/randomfile
cmp ${TESTDIR}/randomfile $newroot/other-subdir/randomfile
test -s $newroot/other-subdir/other-randomfile
cmp ${TESTDIR}/other-randomfile $newroot/other-subdir/other-randomfile
test -d $newroot/cwd
test -s $newroot/cwd/randomfile
cmp ${TESTDIR}/randomfile $newroot/cwd/randomfile
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah rm $newcid
Fixup cleanliness in tests Clean up the tests so that data files that we generate don't get dropped in the root directory of the host, or in a part of ${TMPDIR} that we won't clean up. Add tests to exercise "add"'s extracting logic. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-08 04:54:51 +08:00
}
@test "add-local-archive" {
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
createrandom ${TESTDIR}/randomfile
createrandom ${TESTDIR}/other-randomfile
Fixup cleanliness in tests Clean up the tests so that data files that we generate don't get dropped in the root directory of the host, or in a part of ${TMPDIR} that we won't clean up. Add tests to exercise "add"'s extracting logic. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-08 04:54:51 +08:00
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --signature-policy ${TESTSDIR}/policy.json scratch
cid=$output
BATS major cleanup: part 4: manual stuff This is the manual part of the cleanup. - remove most 'buildah rm's from cleanup steps - remove unused variables - use expect_output when possible, not 'test [ x = y ]' - includes fixing some not-what-you-think-it-is uses of run_buildah | grep - be careful not to leave droppings in current directory Special attention to: - authenticate.bats: create Dockerfile in temp dir, not pwd! - push.bats: remove broken output check - registries.bats: refactor, remove duplicate tests & code - rmi.bats: better checking of messages - secrets.bats: use TESTDIR (tmp), not TESTSDIR (/usr/share) ! We don't want to leave droppings behind if we fail; this has bitten us before. And, since there's only one test, there's no need to override setup() / teardown(). Do setup inline, and take advantage of existing defaults. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 07:21:51 +08:00
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/random1
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/random2
tar -c -C ${TESTDIR} -f ${TESTDIR}/tarball1.tar random1 random2
mkdir ${TESTDIR}/tarball2
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/tarball2/tarball2.random1
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/tarball2/tarball2.random2
tar -c -C ${TESTDIR} -z -f ${TESTDIR}/tarball2.tar.gz tarball2
mkdir ${TESTDIR}/tarball3
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/tarball3/tarball3.random1
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/tarball3/tarball3.random2
tar -c -C ${TESTDIR} -j -f ${TESTDIR}/tarball3.tar.bz2 tarball3
mkdir ${TESTDIR}/tarball4
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/tarball4/tarball4.random1
dd if=/dev/urandom bs=1024 count=4 of=${TESTDIR}/tarball4/tarball4.random2
tar -c -C ${TESTDIR} -j -f ${TESTDIR}/tarball4.tar.bz2 tarball4
# Add the files to the working directory, which should extract them all.
BATS tests - extensive but minor cleanup This started off as bug fixes necessary to get BATS tests actually working on RHEL8 (they weren't). It grew. I will defend my actions in the first comment post. Primary change: import some helpers from podman BATS tests, most importantly 'run_buildah' and 'is'. The vast majority of the changes you'll see here are of the form: - run buildah ... - [ $status = 0 ] - [ check $output ] + run_buildah ... ! automatically checks status + is "$output" "..." Also: chmod'ed some files -x. Necessary because rpmbuild tries to be oh-so-clever about requirements, and when it sees an executable file with a shebang line like '#!env bats' it helpfully adds 'Requires: /usr/bin/bats' to the rpm, which then fails to install because RHEL8 does not have bats. Also: refactored duplicate code in a few places, by writing and invoking module-specific helper functions. Also: changed a handful of 'buildah's to run_buildah, in order to get error checking and debug logging. Also: added descriptive reasons to many "skip"s. Also: selinux test: some tweakery to make it run on production system (context is different if /usr/bin/buildah is chcon'ed appropriately). I can't get this test to pass on Fedora from a build dir, and I'm actually not convinced that this test has ever passed, but let's see what CI shows. Also: selinux test: skip broken test (#1465). Also: version test: skip parts of it if running w/o sources. Tests are now passing as root on RHEL8; rootless has numerous failures which I don't believe are related to this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #1472 Approved by: TomSweeneyRedHat
2019-04-02 05:56:29 +08:00
run_buildah config --workingdir=/ $cid
run_buildah add $cid ${TESTDIR}/tarball1.tar
run_buildah add $cid ${TESTDIR}/tarball2.tar.gz
run_buildah add $cid ${TESTDIR}/tarball3.tar.bz2
run_buildah add $cid ${TESTDIR}/tarball4.tar.bz2
run_buildah commit --signature-policy ${TESTSDIR}/policy.json $cid containers-storage:new-image
run_buildah rm $cid
Fixup cleanliness in tests Clean up the tests so that data files that we generate don't get dropped in the root directory of the host, or in a part of ${TMPDIR} that we won't clean up. Add tests to exercise "add"'s extracting logic. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-08 04:54:51 +08:00
BATS major cleanup: part 4: manual stuff This is the manual part of the cleanup. - remove most 'buildah rm's from cleanup steps - remove unused variables - use expect_output when possible, not 'test [ x = y ]' - includes fixing some not-what-you-think-it-is uses of run_buildah | grep - be careful not to leave droppings in current directory Special attention to: - authenticate.bats: create Dockerfile in temp dir, not pwd! - push.bats: remove broken output check - registries.bats: refactor, remove duplicate tests & code - rmi.bats: better checking of messages - secrets.bats: use TESTDIR (tmp), not TESTSDIR (/usr/share) ! We don't want to leave droppings behind if we fail; this has bitten us before. And, since there's only one test, there's no need to override setup() / teardown(). Do setup inline, and take advantage of existing defaults. Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 07:21:51 +08:00
run_buildah from --signature-policy ${TESTSDIR}/policy.json new-image
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
newcid=$output
run_buildah mount $newcid
newroot=$output
Remove all --name and --root options Also fix up buildah commit to require name and image
2017-03-25 00:49:22 +08:00
test -s $newroot/random1
cmp ${TESTDIR}/random1 $newroot/random1
test -s $newroot/random2
cmp ${TESTDIR}/random2 $newroot/random2
test -s $newroot/tarball2/tarball2.random1
cmp ${TESTDIR}/tarball2/tarball2.random1 $newroot/tarball2/tarball2.random1
test -s $newroot/tarball2/tarball2.random2
cmp ${TESTDIR}/tarball2/tarball2.random2 $newroot/tarball2/tarball2.random2
test -s $newroot/tarball3/tarball3.random1
cmp ${TESTDIR}/tarball3/tarball3.random1 $newroot/tarball3/tarball3.random1
test -s $newroot/tarball3/tarball3.random2
cmp ${TESTDIR}/tarball3/tarball3.random2 $newroot/tarball3/tarball3.random2
test -s $newroot/tarball4/tarball4.random1
cmp ${TESTDIR}/tarball4/tarball4.random1 $newroot/tarball4/tarball4.random1
test -s $newroot/tarball4/tarball4.random2
cmp ${TESTDIR}/tarball4/tarball4.random2 $newroot/tarball4/tarball4.random2
Add some integration tests Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-07 07:11:40 +08:00
}
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
@test "add single file creates absolute path with correct permissions" {
Flake handling: cache and prefetch images Show of hands: who here loves submitting a PR, then coming back hours later to find one job failed, then spending time poring over logs and finding a network error? Anyone? Anyone? This is a lame attempt to minimize such flakes by caching commonly-used images and restoring them on demand. We introduce a new helper, _prefetch(), which podman-pulls an image the first time, podman-saves it, then on subsequent calls (for the same image) podman-loads it: @test foo { _prefetch alpine busybox ...tests that run buildah-from either } This is an imperfect solution: it is incomplete and will grow more so over time as new tests are added. It is difficult to verify its coverage. I'm really unhappy with it but if it works, the Total Sum Of Unhappiness might decrease overall thanks to fewer flakes. If it doesn't work, it's trivial to remove _prefetch calls using a sed script. Shall we give it a chance? Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-12-09 21:45:52 +08:00
_prefetch ubuntu
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
imgName=ubuntu-image
createrandom ${TESTDIR}/distutils.cfg
Test: Get permission in add test The permission may different in different system. Not always a fix value. So update the scripts to get the permission during the test. Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-11-06 17:46:53 +08:00
permission=$(stat -c "%a" ${TESTDIR}/distutils.cfg)
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json ubuntu
cid=$output
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
run_buildah add $cid ${TESTDIR}/distutils.cfg /usr/lib/python3.7/distutils
run_buildah run $cid stat -c "%a" /usr/lib/python3.7/distutils
Test: Get permission in add test The permission may different in different system. Not always a fix value. So update the scripts to get the permission during the test. Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-11-06 17:46:53 +08:00
expect_output $permission
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
run_buildah commit --signature-policy ${TESTSDIR}/policy.json $cid containers-storage:${imgName}
run_buildah rm $cid
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json ${imgName}
newcid=$output
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
run_buildah run $newcid stat -c "%a" /usr/lib/python3.7/distutils
Test: Get permission in add test The permission may different in different system. Not always a fix value. So update the scripts to get the permission during the test. Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-11-06 17:46:53 +08:00
expect_output $permission
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
}
@test "add single file creates relative path with correct permissions" {
Flake handling: cache and prefetch images Show of hands: who here loves submitting a PR, then coming back hours later to find one job failed, then spending time poring over logs and finding a network error? Anyone? Anyone? This is a lame attempt to minimize such flakes by caching commonly-used images and restoring them on demand. We introduce a new helper, _prefetch(), which podman-pulls an image the first time, podman-saves it, then on subsequent calls (for the same image) podman-loads it: @test foo { _prefetch alpine busybox ...tests that run buildah-from either } This is an imperfect solution: it is incomplete and will grow more so over time as new tests are added. It is difficult to verify its coverage. I'm really unhappy with it but if it works, the Total Sum Of Unhappiness might decrease overall thanks to fewer flakes. If it doesn't work, it's trivial to remove _prefetch calls using a sed script. Shall we give it a chance? Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-12-09 21:45:52 +08:00
_prefetch ubuntu
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
imgName=ubuntu-image
createrandom ${TESTDIR}/distutils.cfg
Test: Get permission in add test The permission may different in different system. Not always a fix value. So update the scripts to get the permission during the test. Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-11-06 17:46:53 +08:00
permission=$(stat -c "%a" ${TESTDIR}/distutils.cfg)
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json ubuntu
cid=$output
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
run_buildah add $cid ${TESTDIR}/distutils.cfg lib/custom
run_buildah run $cid stat -c "%a" lib/custom
Test: Get permission in add test The permission may different in different system. Not always a fix value. So update the scripts to get the permission during the test. Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-11-06 17:46:53 +08:00
expect_output $permission
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
run_buildah commit --signature-policy ${TESTSDIR}/policy.json $cid containers-storage:${imgName}
run_buildah rm $cid
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json ${imgName}
newcid=$output
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
run_buildah run $newcid stat -c "%a" lib/custom
Test: Get permission in add test The permission may different in different system. Not always a fix value. So update the scripts to get the permission during the test. Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-11-06 17:46:53 +08:00
expect_output $permission
Create directory paths for COPY thereby ensuring correct perms Signed-off-by: Eric Hripko <ehripko@bloomberg.net> Closes: #1615 Approved by: rhatdan
2019-05-26 20:56:13 +08:00
}
Tests: Add two test for buildah add Add following tests for buildah add 1. buildah add test with --chown 2. buildah add url test Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-10-22 19:50:25 +08:00
@test "add with chown" {
Flake handling: cache and prefetch images Show of hands: who here loves submitting a PR, then coming back hours later to find one job failed, then spending time poring over logs and finding a network error? Anyone? Anyone? This is a lame attempt to minimize such flakes by caching commonly-used images and restoring them on demand. We introduce a new helper, _prefetch(), which podman-pulls an image the first time, podman-saves it, then on subsequent calls (for the same image) podman-loads it: @test foo { _prefetch alpine busybox ...tests that run buildah-from either } This is an imperfect solution: it is incomplete and will grow more so over time as new tests are added. It is difficult to verify its coverage. I'm really unhappy with it but if it works, the Total Sum Of Unhappiness might decrease overall thanks to fewer flakes. If it doesn't work, it's trivial to remove _prefetch calls using a sed script. Shall we give it a chance? Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-12-09 21:45:52 +08:00
_prefetch busybox
Tests: Add two test for buildah add Add following tests for buildah add 1. buildah add test with --chown 2. buildah add url test Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-10-22 19:50:25 +08:00
createrandom ${TESTDIR}/randomfile
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
cid=$output
Tests: Add two test for buildah add Add following tests for buildah add 1. buildah add test with --chown 2. buildah add url test Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-10-22 19:50:25 +08:00
run_buildah add --chown bin:bin $cid ${TESTDIR}/randomfile /tmp/random
run_buildah run $cid ls -l /tmp/random
expect_output --substring bin.*bin
}
buildah add/copy --chmod cli implementation for files and urls Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
2021-02-24 07:14:04 +08:00
@test "add with chmod" {
_prefetch busybox
createrandom ${TESTDIR}/randomfile
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
cid=$output
run_buildah add --chmod 777 $cid ${TESTDIR}/randomfile /tmp/random
run_buildah run $cid ls -l /tmp/random
expect_output --substring rwxrwxrwx
}
Tests: Add two test for buildah add Add following tests for buildah add 1. buildah add test with --chown 2. buildah add url test Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-10-22 19:50:25 +08:00
@test "add url" {
Flake handling: cache and prefetch images Show of hands: who here loves submitting a PR, then coming back hours later to find one job failed, then spending time poring over logs and finding a network error? Anyone? Anyone? This is a lame attempt to minimize such flakes by caching commonly-used images and restoring them on demand. We introduce a new helper, _prefetch(), which podman-pulls an image the first time, podman-saves it, then on subsequent calls (for the same image) podman-loads it: @test foo { _prefetch alpine busybox ...tests that run buildah-from either } This is an imperfect solution: it is incomplete and will grow more so over time as new tests are added. It is difficult to verify its coverage. I'm really unhappy with it but if it works, the Total Sum Of Unhappiness might decrease overall thanks to fewer flakes. If it doesn't work, it's trivial to remove _prefetch calls using a sed script. Shall we give it a chance? Signed-off-by: Ed Santiago <santiago@redhat.com>
2019-12-09 21:45:52 +08:00
_prefetch busybox
BATS major cleanup, part 2: use more run_buildah Replace this pattern: cid=$(buildah ...) with: run_buildah ... cid=$output As a special case, if the buildah command is 'from' and the string 'scratch' does not appear in the arguments, add '--quiet'. Otherwise we'll get Pulling messages as part of $output. This is an overkill solution. For ease of review, this commit was entirely machine-generated via: $ perl -pi -e 's{^(\s+)(\S+)=\$\(buildah (.*)\)$}{$indent=$1;$var=$2;$cmd=$3; $cmd =~ s/(\bfrom)\s(?!.*scratch)/$1 --quiet $2/; "${indent}run_buildah $cmd\n$indent$var=\$output"}e' *.bats Signed-off-by: Ed Santiago <santiago@redhat.com> Closes: #2029 Approved by: rhatdan
2019-12-12 03:11:08 +08:00
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
cid=$output
Change references from master to main Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-06-23 22:44:11 +08:00
run_buildah add $cid https://github.com/containers/buildah/raw/main/README.md
Tests: Add two test for buildah add Add following tests for buildah add 1. buildah add test with --chown 2. buildah add url test Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-10-22 19:50:25 +08:00
run_buildah run $cid ls /README.md
Change references from master to main Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-06-23 22:44:11 +08:00
run_buildah add $cid https://github.com/containers/buildah/raw/main/README.md /home
Tests: Add two test for buildah add Add following tests for buildah add 1. buildah add test with --chown 2. buildah add url test Signed-off-by: Yiqiao Pu <ypu@redhat.com> Closes: #2004 Approved by: rhatdan
2019-10-22 19:50:25 +08:00
run_buildah run $cid ls /home/README.md
}
Add(): fix handling of relative paths with no ContextDir Add() is supposed to handle relative paths when the ContextDir value passed to it is not set, but it hasn't been doing that correctly since it was overhauled. Correct it to recognize relative paths at the function start, when ContextDir is not set, by combining them with the current directory to convert them to absolute paths. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2020-09-16 22:52:01 +08:00
@test "add relative" {
# make sure we don't get thrown by relative source locations
_prefetch busybox
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
cid=$output
run_buildah add $cid deny.json /
run_buildah run $cid ls /deny.json
run_buildah add $cid ./docker.json /
run_buildah run $cid ls /docker.json
run_buildah add $cid tools/Makefile /
run_buildah run $cid ls /Makefile
}
Add --ignorefile flag to use alternate .dockerignore flags Allow users to override location of the .dockerignore file. If user specified an --ignorefile flag, buildah will read the file and pass in the exclude lines based on the .dockerignore contents. Also add a --contextdir flag to buildah copy and buildah add to specify where the context directory is located. For these two commands the --ignorefile flag requires the --contextdir flag. When the --ignorefile flag is passed in, the .dockerignore files in the context directory will be ignored. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-11-19 21:14:58 +08:00
copier.Get(): try to avoid descending into directories When processing a directory tree, only descend into a directory that is marked for exclusion if its path is literally a prefix of an exception pattern. Subtly, but in a way that's compatible with docker, this means that if we exclude directory "subdir", but we've been told to also include "**/file" (with an exclusion pattern of "!**/file"), we won't descend into "subdir" and find a file named "subdir/file", because "**/file" doesn't start with "subdir/". More generally, exclusion patterns that start with "!" which include any wildcards before their final component technically won't be treated correctly. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-08-24 22:41:16 +08:00
@test "add --ignorefile" {
Add --ignorefile flag to use alternate .dockerignore flags Allow users to override location of the .dockerignore file. If user specified an --ignorefile flag, buildah will read the file and pass in the exclude lines based on the .dockerignore contents. Also add a --contextdir flag to buildah copy and buildah add to specify where the context directory is located. For these two commands the --ignorefile flag requires the --contextdir flag. When the --ignorefile flag is passed in, the .dockerignore files in the context directory will be ignored. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-11-19 21:14:58 +08:00
mytest=${TESTDIR}/mytest
mkdir -p ${mytest}
touch ${mytest}/mystuff
touch ${mytest}/source.go
mkdir -p ${mytest}/notmystuff
touch ${mytest}/notmystuff/notmystuff
cat > ${mytest}/.ignore << _EOF
*.go
.ignore
notmystuff
_EOF
expect="
stuff
stuff/mystuff"
run_buildah from --signature-policy ${TESTSDIR}/policy.json scratch
cid=$output
run_buildah 125 copy --ignorefile ${mytest}/.ignore $cid ${mytest} /stuff
copier.Get(): try to avoid descending into directories When processing a directory tree, only descend into a directory that is marked for exclusion if its path is literally a prefix of an exception pattern. Subtly, but in a way that's compatible with docker, this means that if we exclude directory "subdir", but we've been told to also include "**/file" (with an exclusion pattern of "!**/file"), we won't descend into "subdir" and find a file named "subdir/file", because "**/file" doesn't start with "subdir/". More generally, exclusion patterns that start with "!" which include any wildcards before their final component technically won't be treated correctly. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-08-24 22:41:16 +08:00
expect_output -- "--ignorefile option requires that you specify a context dir using --contextdir" "container file list"
Add --ignorefile flag to use alternate .dockerignore flags Allow users to override location of the .dockerignore file. If user specified an --ignorefile flag, buildah will read the file and pass in the exclude lines based on the .dockerignore contents. Also add a --contextdir flag to buildah copy and buildah add to specify where the context directory is located. For these two commands the --ignorefile flag requires the --contextdir flag. When the --ignorefile flag is passed in, the .dockerignore files in the context directory will be ignored. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-11-19 21:14:58 +08:00
run_buildah add --contextdir=${mytest} --ignorefile ${mytest}/.ignore $cid ${mytest} /stuff
run_buildah mount $cid
mnt=$output
run find $mnt -printf "%P\n"
filelist=$(LC_ALL=C sort <<<"$output")
run_buildah umount $cid
expect_output --from="$filelist" "$expect" "container file list"
}
Add some system tests The tests for following options are added. - buildah add --quiet - buildah containers -a - buildah containers --notruncate - buildah copy --quiet - buildah from --memory-swap - buildah from --authfile - buildah from --cap-add/--cap-drop (imitating buildah run --cap-add/--cap-drop) - buildah --from --ulimit - buildah run --user Signed-off-by: Hironori Shiina <shiina.hironori@jp.fujitsu.com>
2021-03-02 01:19:01 +08:00
@test "add quietly" {
_prefetch busybox
createrandom ${TESTDIR}/randomfile
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
cid=$output
run_buildah add --quiet $cid ${TESTDIR}/randomfile /tmp/random
expect_output ""
run_buildah mount $cid
croot=$output
cmp ${TESTDIR}/randomfile ${croot}/tmp/random
}
CLI add/copy: add a --from option Add a --from option to `buildah add` and `buildah copy`, mirroring the option for the Dockerfile instruction. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-04-07 05:48:25 +08:00
@test "add from container" {
_prefetch busybox
createrandom ${TESTDIR}/randomfile
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
from=$output
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
cid=$output
run_buildah add --quiet $from ${TESTDIR}/randomfile /tmp/random
expect_output ""
run_buildah add --quiet --signature-policy ${TESTSDIR}/policy.json --from $from $cid /tmp/random /tmp/random # absolute path
expect_output ""
run_buildah add --quiet --signature-policy ${TESTSDIR}/policy.json --from $from $cid tmp/random /tmp/random2 # relative path
expect_output ""
run_buildah mount $cid
croot=$output
cmp ${TESTDIR}/randomfile ${croot}/tmp/random
cmp ${TESTDIR}/randomfile ${croot}/tmp/random2
}
@test "add from image" {
_prefetch busybox
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json busybox
cid=$output
run_buildah add --quiet --signature-policy ${TESTSDIR}/policy.json --from ubuntu $cid /etc/passwd /tmp/passwd # should pull the image, absolute path
expect_output ""
run_buildah add --quiet --signature-policy ${TESTSDIR}/policy.json --from ubuntu $cid etc/passwd /tmp/passwd2 # relative path
expect_output ""
run_buildah from --quiet --signature-policy ${TESTSDIR}/policy.json ubuntu
ubuntu=$output
run_buildah mount $cid
croot=$output
run_buildah mount $ubuntu
ubuntu=$output
cmp $ubuntu/etc/passwd ${croot}/tmp/passwd
cmp $ubuntu/etc/passwd ${croot}/tmp/passwd2
}