-
Notifications
You must be signed in to change notification settings - Fork 484
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.
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
fix(ipam_driver): do not pass --ipam-driver option when value set to … #851
Conversation
9f20aec
to
c9d2092
Compare
Sorry for the push force. |
7922049
to
23a45c8
Compare
podman_compose.py
Outdated
@@ -762,7 +762,7 @@ async def assert_cnt_nets(compose, cnt): | |||
args.extend(("--opt", f"{key}={value}")) | |||
ipam = net_desc.get("ipam", None) or {} | |||
ipam_driver = ipam.get("driver", None) | |||
if ipam_driver: | |||
if ipam_driver and ipam_driver not in ("default"): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the code would be clearer if we compared using !=
. Also I think there's a bug here, because ("default")
is not a tuple. ("default",)
would be a tuple.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right, the missing ',' is strange because my tests worked ...
Yes, we can compare using !=
.
I do a patch with it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good in principle but will need unit tests.
7b8cebc
to
7de2168
Compare
fixes containers#852. Signed-off-by: fccagou <me@fccagou.fr>
7de2168
to
c23a8b2
Compare
Rebased and adjusted commit message. |
@fccagou Sorry for the delay. I haven't noticed that you've force pushed with the fixes. |
…default
podman returns unsupported ipam driver "default" when
--imap-driver default
parameter is passed.So, when ipam driver is set to "default" in docker-compose.yml, --imap-driver must not be used when podman is called.