Fix DockerNetworkInternalMode issue - #36298
Conversation
|
/cc @tianon and my suggestion is to keep track the |
|
Hum, build failure on janky and experimental |
536c914 to
6604b5d
Compare
|
Hello @vdemeester , just checked the CI results, seems we need to change |
There was a problem hiding this comment.
If we need the glibc version of busybox; should it be included in the frozen images?
There was a problem hiding this comment.
Ah, absolutely I have no objection to add the busybox:glibc into the frozen images if we really have somehow subtle requirements to point the busybox:latest to the uclibc version meaning this will not be changed in the future. If the answer is yes, then I am glad to add the glibc version as frozen image...
There was a problem hiding this comment.
Hmm, I also remember that the busybox:latest point to uclibc only happens on amd64 and arm{32,64} architectures, that's why the powerpc and s390x feel comfortable with this changes 😄 IIRC, @tianon perfer to use busybox:glibc instead of busybox:latest as the frozen images since he is pretty sure glibc version is available on all the necessary architectures.
IMO we can use glibc version (not frozen, just as this PR's) as interim solution if no side-effect (e.g, all the CI passed) in case of latest --> uclibc on amd64 and arm64 is volatile, but if there's some unknown reason the latest --> uclibc is mandatory on {amd, arm}64, then we can think about to make glibc as frozen image
|
Oops, according to the CI, I have to confess that just replace the |
39f3f2d to
752c445
Compare
Update and unify the `busybox` images on all arches to the `glibc` multi-arch version and remove the temp workaround on amd64 which uses the old version busybox (v1.26) before this PR to bypass the failure of those network related test cases. Also, this PR will fix all the network related issues with `glibc` version `busybox` image. Signed-off-by: Dennis Chen <dennis.chen@arm.com>
752c445 to
3a97100
Compare
|
The last working day before the upcoming one-week public holiday🤗 I've frozen the |
|
Long term I think it'd be better to simply use LGTM |
|
Oh, right, hm, my first thought was to add the git grep busybox | wc -l
1999 |
thaJeztah
left a comment
There was a problem hiding this comment.
So, yes, I think "explicit" would be a bit cleaner; could you do a follow up after your vacation?
LGTM
| RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ | ||
| buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ | ||
| busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \ | ||
| busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \ |
There was a problem hiding this comment.
@tianon are all these images now multi-arch? If so, we could unify these (perhaps even have a single Dockerfile for all arch's)
There was a problem hiding this comment.
Yes, absolutely -- I'd love to finally see a single Dockerfile for all architectures! 😄 👍
There was a problem hiding this comment.
Ah, I will +1 absolutely for this 👍 As the 1st step I can see is to merge the Dockerfile.aarch64 into the Dockerfile as an experiment, then the firework is burning... 😄
|
And Happy New Year 🎉 |
|
I would definitely be +1 to instead pulling both |
Absolutely! I will push another PR try to make the "explicit" happy. But keep in mind that, if we have a workable |
This PR include:
Unify the frozen image of
busyboxto the multi-archglibcversion on all available arches, and remove the temp workaround to address the compatible issue onamd64introduced by PR Upgrade the frozen images to multi-arch ones #35929, which made a trade-off to use the old versionbusyboxonamd64order to bypass theTestDockerNetworkInternalModetest case failure, but this issue can be reproduced repeatedly on our localarm64servers.Fix the failure issue of test case
TestDockerNetworkInternalModeon bothamd64andarm{32,64}arches. The root cause is currentbusybox:latestimage is literallybusybox:uclibcwhile notbusybox:glibc[1].[1]. https://github.com/docker-library/official-images/blob/c85c21613ee36a8c7f80ea3a78cd373337709d02/library/busybox#L47
closes #35963
- What I did
Fix the failure of test case
DockerNetworkInternalMode- How I did it
Use
busybox:glibcinstead ofbusybox:latest- How to verify it
make test-integration- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)