diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-09-22 13:22:17 -0400 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-09-25 22:10:22 -0400 |
| commit | 52656887e1cd3476a18765aa81a7804fceb861b4 (patch) | |
| tree | 5eabc3a6e2348982971d6c35830a1371d194f9ad /pkg | |
| parent | 40e8bcb8482f2a1f60b93524ceda05770d20739e (diff) | |
| download | podman-52656887e1cd3476a18765aa81a7804fceb861b4.tar.gz podman-52656887e1cd3476a18765aa81a7804fceb861b4.tar.bz2 podman-52656887e1cd3476a18765aa81a7804fceb861b4.zip | |
compat API: network inspect do not show isolate option
We force the isolate option on new newtworks because that is the docker
behavior. However when we inspect them they should not be displayed to
the caller since they have no idea about it and docker-compose throws an
error because of that.
Fixes #15580
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/networks.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index 29d1398cf..078e75ed3 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -118,6 +118,11 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, network *netty if changeDefaultName && name == runtime.Network().DefaultNetworkName() { name = nettypes.BridgeNetworkDriver } + options := network.Options + // bridge always has isolate set in the compat API but we should not return it to not confuse callers + // https://github.com/containers/podman/issues/15580 + delete(options, nettypes.IsolateOption) + report := types.NetworkResource{ Name: name, ID: network.ID, @@ -126,7 +131,7 @@ func convertLibpodNetworktoDockerNetwork(runtime *libpod.Runtime, network *netty Internal: network.Internal, EnableIPv6: network.IPv6Enabled, Labels: network.Labels, - Options: network.Options, + Options: options, IPAM: ipam, Scope: "local", Attachable: false, |