Docker v26 compatibility & test fixes #3097
Conversation
apostasie
force-pushed
the
dev-3088
branch
4 times, most recently
from
8c524b4
to
8dc1140
Compare
apostasie
force-pushed
the
dev-3088
branch
2 times, most recently
from
b313b8e
to
ed0bf55
Compare
| tests := []struct { | ||
| Network string | ||
| WantErr bool | ||
| Expect string | ||
| }{ | ||
| {"host", true, "conflicting options"}, | ||
| {"none", true, "can't open '/sys/class/net/eth0/address'"}, |
There was a problem hiding this comment.
Testing this is problematic as it does not seem to be there at all with rootless.
Replacing this by calling on ip addr.
| curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-ce_26.1.4-1~ubuntu.22.04~jammy_amd64.deb | ||
| curl -OSl https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-ce-cli_26.1.4-1~ubuntu.22.04~jammy_amd64.deb | ||
| curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-buildx-plugin_0.14.1-1~ubuntu.22.04~jammy_amd64.deb | ||
| curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-compose-plugin_2.27.1-1~ubuntu.22.04~jammy_amd64.deb |
There was a problem hiding this comment.
Also updating the plugins
| tests := []struct { | ||
| Network string | ||
| WantErr bool | ||
| Expect string | ||
| }{ | ||
| {"host", true, "conflicting options"}, | ||
| {"none", true, "can't open '/sys/class/net/eth0/address'"}, |
There was a problem hiding this comment.
Using /sys/class/net is problematic as it does not seem to exist for rootless in any case. Replacing with a call to ip addr to retrieve the mac address instead.
| base.Cmd("start", containerName).AssertOK() | ||
| cmd = base.Cmd("logs", containerName) | ||
| cmd.AssertOK() | ||
| cmd.AssertOutContains(test.Expect) |
There was a problem hiding this comment.
Removing faulty logic resulting in multiple repeat executions.
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
apostasie
changed the title
|
Besides a Windows failure that seems unrelated (can you poke it?), the CI is green on this. As indicated in the initial comment, issues are relatively minor changes in behavior of the docker cli, that we are now aligning with, for better or worse (except for the behavior on ip + bridge which is now documented in #3106). Tests have also been cleaned up slightly as some assumptions were wrong (availability of /sys/net, and multiple execution through testutil assert helpers), the logic has been simplified a bit, and they are now parallelized. @AkihiroSuda and crew, PTAL at your convenience. |
This fix #3088
So far, the issues were:
--net bridge --ip-address#3101 - I am disabling the test for now (which was already broken by the way, since it wasn't testing anything for docker) - we might re-enable pending discussion in the linked ticket