diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-30 17:27:54 +0100 |
| commit | f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch) | |
| tree | e907cb121b30e3c1df1710719c0ddf4029597a47 /app-emulation/docker | |
| parent | db063b515939ab15261136b24e4bc44386335c0c (diff) | |
gentoo resync : 30.09.2020
Diffstat (limited to 'app-emulation/docker')
| -rw-r--r-- | app-emulation/docker/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/docker/docker-19.03.13-r2.ebuild (renamed from app-emulation/docker/docker-19.03.13-r1.ebuild) | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 3878adaf7a12..b4965971adcd 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,5 +1,5 @@ DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3 DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873 EBUILD docker-19.03.12.ebuild 8466 BLAKE2B 6537d7d5adba8122814efc90943f6497e84f5f6da9e4345eddfba5e53f72684879b9ace45046402c2d3efaa5cd5baa46fabebc99c3bba37a4a8faacbc5ce2c9c SHA512 9b8cf5724a855998eeecc453b412e010e08c0614972024ea842d9b842a3593680f2e4d65396c83e32a50f511deab307e6aaaa6c00b967fbd542124223f41fdb0 -EBUILD docker-19.03.13-r1.ebuild 8658 BLAKE2B 3803c3058a3e8796bb5f8efa3b5983c254336d4e207bb58d2e9a208593f0d0094793f98cf42cf27ed8fd918b4dea5ea7a098dfdb7531f5256815e3deaae7ac65 SHA512 4464964f106e14e161de06c1c96a19903d1c5463ea1ba757a0be18174f24c6bb1595a7d906acbfbfa3bea9abd7c2bbe546022791cdfc8ec400c152883e75bdf7 +EBUILD docker-19.03.13-r2.ebuild 8792 BLAKE2B aaca56e033bd5bb424212e0265dec1ebfa961c6fe7a46cda140694a41b26199e729face3834da2f5eac2994a35d8798d56ea8b5f2d6b8e532ffe33c918c713bd SHA512 f3f574dcd1e0bc8223056bd0b4a28c3133bc035fd32f1460d086af17e2a98c6dcf265ec3ed0ffe9956770d3485c192b72511b5d5f9f04ae6f9b8a91608bb452c MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa diff --git a/app-emulation/docker/docker-19.03.13-r1.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild index f00a011e8547..466ac242d032 100644 --- a/app-emulation/docker/docker-19.03.13-r1.ebuild +++ b/app-emulation/docker/docker-19.03.13-r2.ebuild @@ -44,7 +44,9 @@ DEPEND=" # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -# also look at components/*/vendor.conf for exact version of ~pinned dependencies +# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install +# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, +# for appropriate brachch/version of course RDEPEND=" ${DEPEND} !sys-apps/systemd[-cgroup-hybrid(+)] @@ -53,9 +55,9 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - ~app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] - ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?,selinux?] - ~app-emulation/docker-proxy-0.8.0_p20191011 + ~app-emulation/containerd-1.3.7[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] + ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?] + ~app-emulation/docker-proxy-0.8.0_p20200617 container-init? ( >=sys-process/tini-0.18.0[static] ) " @@ -254,7 +256,7 @@ src_compile() { src_install() { dosym containerd /usr/bin/docker-containerd dosym containerd-shim /usr/bin/docker-containerd-shim - dosym ../sbin/runc /usr/bin/docker-runc + dosym runc /usr/bin/docker-runc use container-init && dosym tini /usr/bin/docker-init pushd components/engine || die |