-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
tests/integration/get-images.sh: fix busybox.tar.xz URL #3700
Conversation
Fix issue 3699 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
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.
LGTM
Or should we pin to a commit, as suggested in the ticket? busy box has had some breaking changes recently, so it may be worth pinning to a version. |
That can be complicated for multi-arch branches. |
Yeah, I started down that road with something like this: arch=$(go env GOARCH)
case $arch in
# https://github.com/docker-library/busybox/tree/dist-amd64
amd64) commit=31d342ad033e27c18723a516a2274ab39547be27 ;;
arm)
arm=$(go env GOARM)
arch=$arch${arm:+v$arm}
case $arm in
# https://github.com/docker-library/busybox/tree/dist-arm32v5
5 | 6) commit=96ea82ea25565f78b50bd032d5768d64985d6e11 ;;
# https://github.com/docker-library/busybox/tree/dist-arm32v7
7 | '' | *) commit=5cb6c347469e86e4468e5e248de751b3598bb577 ;;
esac
;;
# https://github.com/docker-library/busybox/tree/dist-arm64v8
arm64) commit=94c664b5ca464546266bce54be0082874a44c7b2 ;;
# https://github.com/docker-library/busybox/tree/dist-i386
386) commit=461a473aef31b7726ea99909a24551bf44565c05 ;;
# https://github.com/docker-library/busybox/tree/dist-mips64le
mips64le) commit=47f73f7c735dcd6760a976bfe0012d251b6ef0a9 ;;
# https://github.com/docker-library/busybox/tree/dist-ppc64le
ppc64le) commit=9ca13bc214717966383cf97e08606b444b7300e4 ;;
# https://github.com/docker-library/busybox/tree/dist-s390x
s390x) commit=a03814d21bcf97767121bb9422a742ec237a09e2 ;;
*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;;
esac
BUSYBOX_URL="https://github.com/docker-library/busybox/raw/$commit/stable/glibc/busybox.tar.xz" but then I noticed this |
It's more verbose, but alternative approach in #3701 |
@opencontainers/runc-maintainers |
I'm okay with merging this one as-is, and work on improving after that |
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.
LGTM
Backport to 1.1 is in #3729. |
Fix #3699