diff options
author | Matt Jolly <Matt.Jolly@footclan.ninja> | 2023-07-20 11:13:27 +1000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-07-20 23:44:00 +0100 |
commit | 4d26d2a205f8933fafac9fa0bad5fe1c832cc459 (patch) | |
tree | 873ff13dfd7f3ec62f7b39f8222bd40fa74f1fc3 /app-containers | |
parent | dev-java/zxing-javase: add upstream/bug link to patch (diff) | |
download | gentoo-4d26d2a205f8933fafac9fa0bad5fe1c832cc459.tar.gz gentoo-4d26d2a205f8933fafac9fa0bad5fe1c832cc459.tar.bz2 gentoo-4d26d2a205f8933fafac9fa0bad5fe1c832cc459.zip |
app-containers/docker-buildx: add 0.11.2
We now skip integration tests:
1. Let's assume that we can trust docker can do that on their own infra
2. We don't want to rely on a running dockerd
3. We can't access the network to pull requested containers
Bring this package under the umbrella of the containers project as
disussed on IRC
Signed-off-by: Matt Jolly <Matt.Jolly@footclan.ninja>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-containers')
-rw-r--r-- | app-containers/docker-buildx/Manifest | 1 | ||||
-rw-r--r-- | app-containers/docker-buildx/docker-buildx-0.11.2.ebuild | 61 | ||||
-rw-r--r-- | app-containers/docker-buildx/docker-buildx-9999.ebuild | 4 | ||||
-rw-r--r-- | app-containers/docker-buildx/metadata.xml | 4 |
4 files changed, 68 insertions, 2 deletions
diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest index 9ce057d50392..6f3ff60b944e 100644 --- a/app-containers/docker-buildx/Manifest +++ b/app-containers/docker-buildx/Manifest @@ -1,2 +1,3 @@ DIST docker-buildx-0.10.2.tar.gz 9187634 BLAKE2B 9a43a7bcb224f33d718928ef3070449cac4db87c951f4337368d0c994f211d4c3db3a5e9c309ce10e357ab24746bed2507e2867c9fdab3b51a5423787362fee1 SHA512 ba6b8baae1a8e24bf9ddc58d5e2451270fa6e3891bae83112ca00ae56b7a4842b45ec970898ec27a2123e312885bf0d8c58cc600d8462787242eb878f45cd877 DIST docker-buildx-0.10.4.tar.gz 9184825 BLAKE2B f0e71c0f6dda5f02da4cf0b0514f67f5d339ba10359afc69aae25abf907447fd22fe3d92427299bc67aeaa6a84e748a8a5cbd86151b2baba2dd01f25cc04a793 SHA512 f82b89b8dd4e45524c8d353c4d7588f47b1c7b7ecf759fd9605247c1c7aa0ca152c3ecdec0e0b62b5eef05e6b65d2ca1f5ccab6d75819b92fc92ff62b44105b7 +DIST docker-buildx-0.11.2.tar.gz 10342565 BLAKE2B 1e034e9a07f36b46096f8f035869adc93b63af46cd9886f5ed4bc0939ce2f76b7f029a11ee536a34be23952e5c85251d757cec9ff05df172e3a26ea82a1bf0b1 SHA512 6f3718edf1e86c4422e1419580e4c38cf378a59555067be2aa6fac3e7f8878afe39d777765ace274cd9c47630f39cbacfacfdc4ecadd6ff46d5ee37d8f9bc75c diff --git a/app-containers/docker-buildx/docker-buildx-0.11.2.ebuild b/app-containers/docker-buildx/docker-buildx-0.11.2.ebuild new file mode 100644 index 000000000000..8cecb6eed7ae --- /dev/null +++ b/app-containers/docker-buildx/docker-buildx-0.11.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +MY_PN="buildx" +DESCRIPTION="Docker CLI plugin for extended build capabilities with BuildKit" +HOMEPAGE="https://github.com/docker/buildx" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/docker/buildx.git" +else + SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +LICENSE="Apache-2.0" +SLOT="0" + +# This gives us the ability to neatly `-skip` tests. +# not required once ::gentoo is all > 1.20 +RESTRICT="!test? ( test )" +IUSE="test" + +BDEPEND=" + test? ( >=dev-lang/go-1.20 ) +" +RDEPEND="app-containers/docker-cli" + +src_compile() { + local _buildx_r='github.com/docker/buildx' + local version=${PV} + if [[ ${PV} == 9999 ]]; then + version="$(git rev-parse --short HEAD)" + fi + ego build -o docker-buildx \ + -ldflags "-linkmode=external + -X $_buildx_r/version.Version=${version} + -X $_buildx_r/version.Revision=$(date -u +%FT%T%z) + -X $_buildx_r/version.Package=$_buildx_r" \ + ./cmd/buildx +} + +src_test() { + # TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism. + if [[ ${PV} == 9999 ]]; then + ego test ./... -skip "TestReadTargets|TestIntegration" + else + ego test ./... -skip "TestGit|TestReadTargets|TestIntegration" + fi +} + +src_install() { + exeinto /usr/libexec/docker/cli-plugins + doexe docker-buildx + + dodoc README.md +} diff --git a/app-containers/docker-buildx/docker-buildx-9999.ebuild b/app-containers/docker-buildx/docker-buildx-9999.ebuild index 48941a07ce98..8cecb6eed7ae 100644 --- a/app-containers/docker-buildx/docker-buildx-9999.ebuild +++ b/app-containers/docker-buildx/docker-buildx-9999.ebuild @@ -47,9 +47,9 @@ src_compile() { src_test() { # TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism. if [[ ${PV} == 9999 ]]; then - ego test ./... -skip "TestReadTargets" + ego test ./... -skip "TestReadTargets|TestIntegration" else - ego test ./... -skip "TestGit|TestReadTargets" + ego test ./... -skip "TestGit|TestReadTargets|TestIntegration" fi } diff --git a/app-containers/docker-buildx/metadata.xml b/app-containers/docker-buildx/metadata.xml index 42cd3f472a0d..14dd56055eaf 100644 --- a/app-containers/docker-buildx/metadata.xml +++ b/app-containers/docker-buildx/metadata.xml @@ -9,6 +9,10 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <maintainer type="project"> + <email>containers@gentoo.org</email> + <name>Containers</name> + </maintainer> <upstream> <remote-id type="github">docker/buildx</remote-id> </upstream> |