diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-22 14:27:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 14:27:41 +0200 |
| commit | 5e43fb15cc8165c855ab403dafb88daeb5dbdcd9 (patch) | |
| tree | 9da018b2d39f35708fc963990f37fcf08c7f4a20 /test/compose | |
| parent | 99bf6f96cd93867813e72742c484ab0abf15cca4 (diff) | |
| parent | afbfbe18a15092065ba712dd12f3af8f157d513f (diff) | |
| download | podman-5e43fb15cc8165c855ab403dafb88daeb5dbdcd9.tar.gz podman-5e43fb15cc8165c855ab403dafb88daeb5dbdcd9.tar.bz2 podman-5e43fb15cc8165c855ab403dafb88daeb5dbdcd9.zip | |
Merge pull request #15016 from Luap99/compat-netname
compat api: allow default bridge name for networks
Diffstat (limited to 'test/compose')
| -rwxr-xr-x | test/compose/test-compose | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/compose/test-compose b/test/compose/test-compose index 7c4bf2e91..99d063c25 100755 --- a/test/compose/test-compose +++ b/test/compose/test-compose @@ -212,7 +212,6 @@ function start_service() { rm -f $DOCKER_SOCK mkdir --mode 0755 $WORKDIR/{root,runroot,cni} chcon --reference=/var/lib/containers $WORKDIR/root - cp /etc/cni/net.d/*podman*conflist $WORKDIR/cni/ $PODMAN_BIN \ --log-level debug \ |