summaryrefslogtreecommitdiff
path: root/test/compose/test-compose
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-01-18 16:17:53 +0100
committerPaul Holzinger <pholzing@redhat.com>2022-01-18 19:28:25 +0100
commitc0e07234631cfcea1d6724c05606964a4d833f39 (patch)
tree57c80b1ff2804f26a0546117b01c30ffbadcbc1c /test/compose/test-compose
parent55ad6188b067ba6594819c318dd2ae92dea2f27e (diff)
downloadpodman-c0e07234631cfcea1d6724c05606964a4d833f39.tar.gz
podman-c0e07234631cfcea1d6724c05606964a4d833f39.tar.bz2
podman-c0e07234631cfcea1d6724c05606964a4d833f39.zip
rename --cni-config-dir to --network-config-dir
Since this option will also be used for netavark we should rename it to something more generic. It is important that --cni-config-dir still works otherwise we could break existing container cleanup commands. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'test/compose/test-compose')
-rwxr-xr-xtest/compose/test-compose4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/compose/test-compose b/test/compose/test-compose
index beaf276fd..7c4bf2e91 100755
--- a/test/compose/test-compose
+++ b/test/compose/test-compose
@@ -220,7 +220,7 @@ function start_service() {
--root $WORKDIR/root \
--runroot $WORKDIR/runroot \
--cgroup-manager=systemd \
- --cni-config-dir $WORKDIR/cni \
+ --network-config-dir $WORKDIR/cni \
system service \
--time 0 unix://$DOCKER_SOCK \
&> $WORKDIR/server.log &
@@ -247,7 +247,7 @@ function podman() {
--storage-driver=vfs \
--root $WORKDIR/root \
--runroot $WORKDIR/runroot \
- --cni-config-dir $WORKDIR/cni \
+ --network-config-dir $WORKDIR/cni \
"$@")
echo -n "$output" >>$WORKDIR/output.log
}