Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

always add short container id as net alias #11751

Merged
merged 3 commits into from
Sep 28, 2021
Merged

always add short container id as net alias #11751

merged 3 commits into from
Sep 28, 2021

Commits on Sep 28, 2021

  1. always add short container id as net alias 

    This matches what docker does. Also make sure the net aliases are also
shown when the container is stopped.

docker-compose uses this special alias entry to check if it is already
correctly connected to the network. [1]
Because we do not support static ips on network connect at the moment
calling disconnect && connect will loose the static ip.

Fixes containers#11748

[1] https://github.com/docker/compose/blob/0bea52b18dda3de8c28fcfb0c80cc08b8950645e/compose/service.py#L663-L667

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    @Luap99
    Luap99 committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    05614ee View commit details
    Browse the repository at this point in the history

  2. set --cni-config-dir for exit command 

    Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    @Luap99
    Luap99 committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    d0950f3 View commit details
    Browse the repository at this point in the history

  3. move network alias validation to container create 

    Podman 4.0 currently errors when you use network aliases for a network which
has dns disabled. Because the error happens on network setup this can
cause regression for old working containers. The network backend should not
validate this. Instead podman should check this at container create time
and also for network connect.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
    @Luap99
    Luap99 committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    1c89262 View commit details
    Browse the repository at this point in the history