summaryrefslogtreecommitdiff
path: root/test/compose
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-28 10:03:17 -0400
committerGitHub <noreply@github.com>2021-09-28 10:03:17 -0400
commit2d22d17066aae4c357aff7015220cd4095d996f8 (patch)
tree153f1cb64bd9bbf913ac3c45f32605d44c4298e5 /test/compose
parentcc23e059d9537360d0eb4c16c4f0598efd8ecb0d (diff)
parent1c8926285d1ecdfe201fe68896657573dcdc22b7 (diff)
downloadpodman-2d22d17066aae4c357aff7015220cd4095d996f8.tar.gz
podman-2d22d17066aae4c357aff7015220cd4095d996f8.tar.bz2
podman-2d22d17066aae4c357aff7015220cd4095d996f8.zip
Merge pull request #11751 from Luap99/net-alias
always add short container id as net alias
Diffstat (limited to 'test/compose')
-rwxr-xr-xtest/compose/test-compose1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/compose/test-compose b/test/compose/test-compose
index 70db6dd55..beaf276fd 100755
--- a/test/compose/test-compose
+++ b/test/compose/test-compose
@@ -247,6 +247,7 @@ function podman() {
--storage-driver=vfs \
--root $WORKDIR/root \
--runroot $WORKDIR/runroot \
+ --cni-config-dir $WORKDIR/cni \
"$@")
echo -n "$output" >>$WORKDIR/output.log
}