mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 23:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2514 from euank/docker-17

Browse Source 
app-emulation/docker: update to 17.04-ce
This commit is contained in:
Euan Kemp 2017-04-11 19:53:17 -07:00 committed by GitHub
commit c601e3554f
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST containerd-0.2.3_p85.tar.gz 1021240 SHA256 77ea44af1531d46b22f0444eb506590d1b7e5a9fe891cc6f8e36db5c2aef2d80 SHA512 df782f44f53a39dbec5be281c98b1457d86d902e44451b995c35143f843e0233ac72dfea44407e47a39931bbedfa0537cf0e597d68509e3ae21311be0cc20cd6 WHIRLPOOL 322a577ed865dcac7d1185b7f7e67e59190de9f8898c6e14b7b99ada2e069652d20723f5f746fbe476586a4a3d204dc1e0563f325ea4cc0aa968e26c09debf34 DIST containerd-0.2.3_p109.tar.gz 1036056 SHA256 8223d934fa767fcabf45c734bdb616818a5eab8c95d525de6a69a350f4aeb826 SHA512 96f8a6a5053018fc7889583481c1e24d5cfd8cb780bd76d7c09d299cac836f0842927aa6c5ff7ae8b3cded99b596fce64c7db18f9de6dc527eacc2202baa01dd WHIRLPOOL feac3f3f1f078b46a4ef794e287fee78a34a59b159295f9f5779733e93c6b315cedde658538644d33a41057392c34a44b7de08942c77a03c456c1aef24862fa7
DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4 DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4

0
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p85-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.3_p109.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild vendored
View File

@ -6,7 +6,7 @@ EAPI=5
GITHUB_URI="github.com/docker/${PN}" GITHUB_URI="github.com/docker/${PN}"
COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.6" COREOS_GO_VERSION="go1.7"
if [[ ${PV} == *9999 ]]; then if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://${GITHUB_URI}.git" EGIT_REPO_URI="https://${GITHUB_URI}.git"
@ -17,7 +17,7 @@ else
# tagged version. # tagged version.
# e.g. git log ${base_version}..${EGIT_COMMIT} --oneline | wc -l # e.g. git log ${base_version}..${EGIT_COMMIT} --oneline | wc -l
# Note: 0.2.3 in the docker-1.13.x branch is not tagged, use 973f21f # Note: 0.2.3 in the docker-1.13.x branch is not tagged, use 973f21f
EGIT_COMMIT="aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1" EGIT_COMMIT="422e31ce907fd9c3833a38d7b8fdd023e5a76e73"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
inherit vcs-snapshot inherit vcs-snapshot

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest vendored
View File

@ -1 +1 @@
DIST docker-proxy-0.8.0_p20170131.tar.gz 2112038 SHA256 823f6601361b02ae6a00bfc416b0286629dbf794d36fb65ba1d88eaa379f397b SHA512 754cf6489968f3a83392c52b9445f71e8d5faca96e23ffc3ee2c6e8644bf065b64c7497395cf8fac9cc083ce9c7668260e319d01a8f10613e67db2d8254f6b06 WHIRLPOOL 095c32dec47806e142e345b21bc9e9bb5ce0b8c3f8f6e821f783dc8c2a080ac304aebe57ce56408481a0fa4c3becf10dd8991d57489ae27f1046cde75b659f6d DIST docker-proxy-0.8.0_p20170410.tar.gz 2176893 SHA256 49d31e8b386b88d45d9c417d8d775fa647ecdc66f8e2a93a35f401c7bc8c9c1c SHA512 6bd82d64d2847a01feb6004ad180f77e767d4a27ca742a66c411f2824f50ca4439974010e32a18a6b03bc1f6186ee7a7c5f86f6c9cbbd8c275fb7fdd345b7bc1 WHIRLPOOL 575e0c9476fdfbbafc35ef29c43725f51dc00e00517293d3fc4218e5cbc6fe1056a1b1e5498c981856af17e2add7df9841485b4f20b49f8cbefe1f20f1e4c68c

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170131.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170410.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild vendored
View File

@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
inherit golang-vcs inherit golang-vcs
else else
EGIT_COMMIT="0f534354b813003a754606689722fe253101bc4e" EGIT_COMMIT="7b2b1feb1de4817d522cc372af149ff48d25028e"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
inherit golang-vcs-snapshot inherit golang-vcs-snapshot
@ -29,7 +29,7 @@ IUSE=""
S=${WORKDIR}/${P}/src/${EGO_PN} S=${WORKDIR}/${P}/src/${EGO_PN}
RDEPEND="!<app-emulation/docker-1.13.0_rc1" RDEPEND="!<app-emulation/docker-17.04.0"
src_compile() { src_compile() {
go_build "${COREOS_GO_PACKAGE}/cmd/proxy" go_build "${COREOS_GO_PACKAGE}/cmd/proxy"

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.1-r3.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.04.0.ebuild vendored
View File

8
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="unknown" DOCKER_GITCOMMIT="unknown"
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="092cba3727bb9b4a2f0e922cd6c0f93ea270e363" # coreos-1.13.1 CROS_WORKON_COMMIT="4845c567eb35d68f35b0b1713a09b0c8d47fe67e" # coreos-17.04.0-ce
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi
@ -27,7 +27,7 @@ SLOT="0"
IUSE="apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp IUSE="apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp
+selinux vim-syntax zsh-completion +journald" +selinux vim-syntax zsh-completion +journald"
# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies # https://github.com/docker/docker/blob/v17.04.0-ce/project/PACKAGERS.md#build-dependencies
CDEPEND=" CDEPEND="
>=dev-db/sqlite-3.7.9:3 >=dev-db/sqlite-3.7.9:3
device-mapper? ( device-mapper? (
@ -66,8 +66,8 @@ RDEPEND="
>=app-arch/xz-utils-4.9 >=app-arch/xz-utils-4.9
>=sys-apps/shadow-4.4 >=sys-apps/shadow-4.4
=app-emulation/containerd-0.2.3_p85-r1[seccomp?] =app-emulation/containerd-0.2.3_p109[seccomp?]
=app-emulation/runc-1.0.0_rc2_p133[apparmor?,seccomp?] =app-emulation/runc-1.0.0_rc2_p137[apparmor?,seccomp?]
app-emulation/docker-proxy app-emulation/docker-proxy
" "

2
sdk_container/src/third_party/coreos-overlay/app-emulation/runc/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST runc-1.0.0_rc2_p133.tar.gz 560793 SHA256 11f69923a786efb82b65d9f1eec0ac665a985e631a67f3f4d466dac720efacdd SHA512 8c19a02a55108cef36cbd1ff739a3c8e2962d188c426517fce91483ec525546d39c14072f0a0f2471b6b70a05cf6c1f0e99cfeb5e87203fcbae955bd5f5bd16b WHIRLPOOL 8a1f44234c668aca5c53e401ce80e2c297ad9c7ed0b10d782494e93020f824e6d5e3a00be221f1ff5d039df998c43556228503788181a45256d91278dd005721 DIST runc-1.0.0_rc2_p137.tar.gz 561483 SHA256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 SHA512 225a37b4a3a79ff0d7a3e74b997f6e5547e270d02c58e65ccb5ea2d81771c489378727bd6abf2f445ea94c2e7717e2991da9fb4cab74327fd57c0e6218143cc3 WHIRLPOOL ecf6ee1d2ed977b74d0d5d5dbf3ff2cc96728bd680a13c58f715dea2401002b0da461d6d2d9ac6af35f290a356821b19175e6f5004fa25b3c8d82eca69d87965
DIST runc-1.0.0_rc2_p9.tar.gz 550963 SHA256 374822cc2895ed3899b7a3a03b566413ea782fccec1307231f27894e9c6d5bea SHA512 0176fc0fd69b298b5cb304388544a45b3805154f635c4a7492daac6e33774b16ad76af2b3008205de169306812834f4299106c89a17b1667168f3ad2ddc2e975 WHIRLPOOL 5015352fe7dc9ddedf93d555cf2750b3e9d72adfda534b1e30a69ac8b6b05e73bfbbe0ba72f543be4e3133f1604a5b42acc3363d30187a75861ca42755dfff81 DIST runc-1.0.0_rc2_p9.tar.gz 550963 SHA256 374822cc2895ed3899b7a3a03b566413ea782fccec1307231f27894e9c6d5bea SHA512 0176fc0fd69b298b5cb304388544a45b3805154f635c4a7492daac6e33774b16ad76af2b3008205de169306812834f4299106c89a17b1667168f3ad2ddc2e975 WHIRLPOOL 5015352fe7dc9ddedf93d555cf2750b3e9d72adfda534b1e30a69ac8b6b05e73bfbbe0ba72f543be4e3133f1604a5b42acc3363d30187a75861ca42755dfff81

0
sdk_container/src/third_party/coreos-overlay/app-emulation/runc/files/0003-1.0.0_rc2_p133-Delay-unshare-of-clone-newipc-for-selinux.patch → sdk_container/src/third_party/coreos-overlay/app-emulation/runc/files/0003-1.0.0_rc2_p137-Delay-unshare-of-clone-newipc-for-selinux.patch vendored
View File

2
sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2_p133.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2_p137.ebuild vendored
View File

@ -15,7 +15,7 @@ COREOS_GO_VERSION="go1.6"
# The patch version is arbitrarily the number of commits since the tag version # The patch version is arbitrarily the number of commits since the tag version
# spcified in the ebuild name. For example: # spcified in the ebuild name. For example:
# $ git log v1.0.0-rc2..${COMMIT_ID} --oneline | wc -l # $ git log v1.0.0-rc2..${COMMIT_ID} --oneline | wc -l
COMMIT_ID="9df8b306d01f59d3a8029be411de015b7304dd8f" COMMIT_ID="9c2d8d184e5da67c95d601382adf14862e4f2228"
inherit eutils flag-o-matic coreos-go-depend vcs-snapshot inherit eutils flag-o-matic coreos-go-depend vcs-snapshot