opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 08:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ignore docker's end point config when the final network mode isn't bridge.

Browse Source 
Closes #21754

Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
This commit is contained in:
Romain Geissler
2024-02-22 15:44:03 +00:00
parent 5a844511c8
commit 127a8060ab
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/handlers/compat/containers_create.go
View File

@ -373,7 +373,17 @@ func cliOpts(cc handlers.CreateContainerConfig, rtc *config.Config) (*entities.C
} }
} }
networks[netName] = netOpts // Report configuration error in case bridge mode is not used.
if !nsmode.IsBridge() && (len(netOpts.Aliases) > 0 || len(netOpts.StaticIPs) > 0 || len(netOpts.StaticMAC) > 0) {
return nil, nil, fmt.Errorf("networks and static ip/mac address can only be used with Bridge mode networking")
} else if nsmode.IsBridge() {
// Docker CLI now always sends the end point config when using the default (bridge) mode
// however podman configuration doesn't expect this to define this at all when not in bridge
// mode and the podman server config might override the default network mode to something
// else than bridge. So adapt to the podman expectation and define custom end point config
// only when really using the bridge mode.
networks[netName] = netOpts
}
} }
netInfo.Networks = networks netInfo.Networks = networks

23
test/apiv2/20-containers.at
View File

@ -527,6 +527,29 @@ t GET containers/$cid/json 200 \
t DELETE containers/$cid?v=true 204 t DELETE containers/$cid?v=true 204
# test create container like Docker >= 25 cli: NetworkMode="default" but EndpointsConfig struct is explictly set and netns="host"
t POST containers/create \
Image=$IMAGE \
HostConfig='{"NetworkMode":"default"}' \
NetworkingConfig='{"EndpointsConfig":{"default":{"IPAMConfig":null,"Links":null,"Aliases":null,"MacAddress":"","NetworkID":"","EndpointID":"","Gateway":"","IPAddress":"","IPPrefixLen":0,"IPv6Gateway":"","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"DriverOpts":null,"DNSNames":null}}}' \
201 \
.Id~[0-9a-f]\\{64\\}
cid=$(jq -r '.Id' <<<"$output")
t GET containers/$cid/json 200 \
.HostConfig.NetworkMode="host"
t DELETE containers/$cid?v=true 204
# test creating a container fails with netns="hosts" on podman side but keep using the default network mode
# on docker CLI side and trying to use --ip 1.2.3.4 which is only valid for the bridge network mode (docker CLI
# will assume the default is the bridge mode, so it's valid from docker CLI point of view).
t POST containers/create \
Image=$IMAGE \
HostConfig='{"NetworkMode":"default"}' \
NetworkingConfig='{"EndpointsConfig":{"default":{"IPAMConfig":null,"Links":null,"Aliases":null,"MacAddress":"","NetworkID":"","EndpointID":"","Gateway":"","IPAddress":"1.2.3.4","IPPrefixLen":0,"IPv6Gateway":"","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"DriverOpts":null,"DNSNames":null}}}' \
500 \
.cause="networks and static ip/mac address can only be used with Bridge mode networking"
# Restart with the default containers.conf for next tests. # Restart with the default containers.conf for next tests.
stop_service stop_service
start_service start_service