diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-18 15:42:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 15:42:06 -0500 |
| commit | 094b11cbcb528a7d120c31402a1bcd9c82d84938 (patch) | |
| tree | 3ce00f13dda775d979a093658f26cea4122646d9 /test/compose/test-compose | |
| parent | 62212dbf490d736ad06523a92345a480e4972dab (diff) | |
| parent | c0e07234631cfcea1d6724c05606964a4d833f39 (diff) | |
| download | podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.gz podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.bz2 podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.zip | |
Merge pull request #12908 from Luap99/network-conf-dir
rename --cni-config-dir to --network-config-dir
Diffstat (limited to 'test/compose/test-compose')
| -rwxr-xr-x | test/compose/test-compose | 4 |
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 } |