mirror of
https://github.com/containers/podman.git
synced 2025-12-08 06:39:05 +08:00
Merge pull request #15016 from Luap99/compat-netname
compat api: allow default bridge name for networks
This commit is contained in:
@@ -84,12 +84,24 @@ t GET networks?filters='{"dangling":["true","0"]}' 500 \
|
||||
t GET networks?filters='{"name":["doesnotexists"]}' 200 \
|
||||
"[]"
|
||||
|
||||
# check default name in list endpoint
|
||||
t GET networks 200 \
|
||||
.[].Name~.*bridge.*
|
||||
|
||||
# network inspect docker
|
||||
t GET networks/$network1_id 200 \
|
||||
.Name=network1 \
|
||||
.Id=$network1_id \
|
||||
.Scope=local
|
||||
|
||||
# inspect default bridge network
|
||||
t GET networks/bridge 200 \
|
||||
.Name=bridge
|
||||
|
||||
# inspect default bridge network with real podman name should return real name
|
||||
t GET networks/podman 200 \
|
||||
.Name=podman
|
||||
|
||||
# network create docker
|
||||
t POST networks/create Name=net3\ IPAM='{"Config":[]}' 201
|
||||
# network delete docker
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user