summaryrefslogtreecommitdiff
path: root/test/system/helpers.bash
diff options
context:
space:
mode:
authorValentin Rothberg <vrothberg@redhat.com>2022-03-16 14:04:07 +0100
committerValentin Rothberg <vrothberg@redhat.com>2022-03-17 14:18:16 +0100
commitff54aaa634f9b3fbcdc67ceff8ebcc9689ca0658 (patch)
treeadd8ad426c75658a9c6297cc2d901902c9579ea6 /test/system/helpers.bash
parentfa33f3527f14edbf7407ba3ba482ef839debfb39 (diff)
downloadpodman-ff54aaa634f9b3fbcdc67ceff8ebcc9689ca0658.tar.gz
podman-ff54aaa634f9b3fbcdc67ceff8ebcc9689ca0658.tar.bz2
podman-ff54aaa634f9b3fbcdc67ceff8ebcc9689ca0658.zip
podman create: building local pause image: do not read ignore files
Make sure to ignore local {container,docker}ignore files when building a local pause image. Otherwise, we may mistakenly not be able to copy catatonit into the build container. Fixes: #13529 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'test/system/helpers.bash')
-rw-r--r--test/system/helpers.bash9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 221315b97..0d336592f 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -383,6 +383,15 @@ function journald_unavailable() {
return 1
}
+# Returns the name of the local pause image.
+function pause_image() {
+ # This function is intended to be used as '$(pause_image)', i.e.
+ # our caller wants our output. run_podman() messes with output because
+ # it emits the command invocation to stdout, hence the redirection.
+ run_podman version --format "{{.Server.Version}}-{{.Server.Built}}" >/dev/null
+ echo "localhost/podman-pause:$output"
+}
+
###########################
# _add_label_if_missing # make sure skip messages include rootless/remote
###########################