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.

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

Merged
merged 1 commit into from
Jan 17, 2023

Conversation

AkihiroSuda
Copy link
Member

Fix #3699

Fix issue 3699

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda added area/ci backport/1.1-todo A PR in main branch which needs to be backported to release-1.1 labels Jan 11, 2023
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member

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.

@AkihiroSuda
Copy link
Member Author

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.
Eventually we should just use skopeo or something to fetch an OCI image from a registry with a fixed digest.

@tianon
Copy link
Member

tianon commented Jan 12, 2023

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 $arch is used for downloading Debian rootfs.tar.xz files too, which is also going to break soon 😕

@tianon
Copy link
Member

tianon commented Jan 12, 2023

It's more verbose, but alternative approach in #3701

@AkihiroSuda AkihiroSuda requested a review from kolyshkin January 12, 2023 21:55
@AkihiroSuda
Copy link
Member Author

@opencontainers/runc-maintainers
To unblock merging other PRs, can we merge this as-is and revisit #3701 (or another approach) separately?

@thaJeztah
Copy link
Member

I'm okay with merging this one as-is, and work on improving after that

Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kolyshkin kolyshkin merged commit 3c12cbd into opencontainers:main Jan 17, 2023
@rata rata mentioned this pull request Feb 6, 2023
@kolyshkin kolyshkin mentioned this pull request Feb 8, 2023
@kolyshkin
Copy link
Contributor

Backport to 1.1 is in #3729.

@kolyshkin kolyshkin added backport/1.1-done A PR in main branch which has been backported to release-1.1 and removed backport/1.1-todo A PR in main branch which needs to be backported to release-1.1 labels Apr 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ci backport/1.1-done A PR in main branch which has been backported to release-1.1
Projects
None yet
4 participants