summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-03-26 15:47:48 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-03-26 22:04:14 -0400
commit6e250c317c9bddafeb9b7c36dbdc9a79a457da32 (patch)
treefcf4803bd57034d0013e17c838b7c25c9543aee0 /contrib
parent4d0b583340c37efbf175c00d75d75107a0b23f00 (diff)
downloadpodman-6e250c317c9bddafeb9b7c36dbdc9a79a457da32.tar.gz
podman-6e250c317c9bddafeb9b7c36dbdc9a79a457da32.tar.bz2
podman-6e250c317c9bddafeb9b7c36dbdc9a79a457da32.zip
[NO TESTS NEEDED] Turn on podman-remote build --isolation
Currently podman only works with --isolation chroot. This PR fixes this by allowing the isolation mode to default to OCI and to also allow users to pass the isolation mode into the containers. The current tests for --isolation should cause this code to be tested. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index fcb1284e7..36878365d 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -36,6 +36,9 @@ do
fi
done
+# Make sure cni network plugins directory exists
+mkdir -p /etc/cni/net.d
+
# Ensure that all lower-level contexts and child-processes have
# ready access to higher level orchestration (e.g Cirrus-CI)
# variables.