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

Merge pull request #2914 from dm0-/docker

Browse Source 
Upgrade to Docker 17.11
This commit is contained in:
David Michael 2017-11-30 22:44:46 -05:00 committed by GitHub
commit 5dc1c520b0
18 changed files with 129 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json vendored
View File

@ -4,7 +4,7 @@
"images": [
{
"name": "docker",
"reference": "17.10"
"reference": "17.11"
}
]
}

0
sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.1.2-r2.ebuild → sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.1.2-r3.ebuild vendored
View File

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

@ -1,3 +1,4 @@
DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4
DIST containerd-0.2.6.tar.gz 1020572 SHA256 a67c4153ac5ae26b9d11daac133b90cba059ba16de7579e39c3e82bcda856493 SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 WHIRLPOOL 98f64c888ea580074e51b91311ab186291cb2d3ecc9f178d828687dbb60b35104237041699b6125cf026edd245459a052fda1801ac3cd7e1efe34606c3d9a4eb
DIST containerd-0.2.9_p27.tar.gz 1140788 SHA256 4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a WHIRLPOOL 75cb3467a94af50bef52377f309d7c85386475789fab3d2758679f022b516735728a1ac2c54307954a14100c4f84059d8fd5e8376270fdd69e572cff43453fa0
DIST containerd-1.0.0_beta2_p53.tar.gz 3682585 SHA256 2c3ffd4306fbb7dc843832e7d4876bc9400ea4bb52d4bb3d86fc61f223ee114d SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9 WHIRLPOOL 11006ce534180ab80c337df08de6ecd58bfea2829e0b5ba5c32531214033dd767bd897e982066c43d4d024705040b998f258fa7facda5bbbbedd5a1f009ed13b

1
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.9_p27.ebuild vendored
View File

@ -1 +0,0 @@
containerd-9999.ebuild

55
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.9_p27.ebuild vendored Normal file
View File

@ -0,0 +1,55 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
GITHUB_URI="github.com/containerd/containerd"
COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.8"
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://${GITHUB_URI}.git"
inherit git-r3
else
# Update the patch number when setting commit.
# The patch number is arbitrarily chosen as the number of commits since the
# tagged version.
# e.g. git log --oneline v0.2.9..${EGIT_COMMIT} | wc -l
EGIT_COMMIT="06b9cb35161009dcb7123345749fef02f7cea8e0"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
inherit vcs-snapshot
fi
inherit coreos-go systemd
DESCRIPTION="A daemon to control runC"
HOMEPAGE="https://containerd.tools"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="hardened +seccomp"
DEPEND=""
RDEPEND=">=app-emulation/docker-runc-1.0.0_rc4
seccomp? ( sys-libs/libseccomp )"
S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}
RESTRICT="test"
src_unpack() {
mkdir -p "${S}"
tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}"
}
src_compile() {
local options=( $(usex seccomp "seccomp" '') )
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
}
src_install() {
dobin bin/containerd* bin/ctr
systemd_dounit "${FILESDIR}/containerd.service"
}

1
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0_beta2_p53.ebuild vendored Symbolic link
View File

@ -0,0 +1 @@
containerd-9999.ebuild

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

@ -5,7 +5,7 @@ EAPI=6
GITHUB_URI="github.com/containerd/containerd"
COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.8"
COREOS_GO_VERSION="go1.9"
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://${GITHUB_URI}.git"
@ -14,11 +14,12 @@ else
# Update the patch number when setting commit.
# The patch number is arbitrarily chosen as the number of commits since the
# tagged version.
# e.g. git log --oneline v0.2.9..${EGIT_COMMIT} | wc -l
EGIT_COMMIT="06b9cb35161009dcb7123345749fef02f7cea8e0"
# e.g. git log --oneline v1.0.0-beta.2..${EGIT_COMMIT} | wc -l
EGIT_COMMIT="992280e8e265f491f7a624ab82f3e238be086e49"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
inherit vcs-snapshot
MAKE_VERSION_ARGS="REVISION=${EGIT_COMMIT} VERSION=v1.0.0-beta.2-53-g992280e8"
fi
inherit coreos-go systemd
@ -46,10 +47,12 @@ src_unpack() {
src_compile() {
local options=( $(usex seccomp "seccomp" '') )
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake ${MAKE_VERSION_ARGS} BUILDTAGS="${options[@]}"
}
src_install() {
dobin bin/containerd* bin/ctr
systemd_dounit "${FILESDIR}/containerd.service"
systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service"
insinto /usr/share/containerd
doins "${FILESDIR}/config.toml"
}

27
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml vendored Normal file
View File

@ -0,0 +1,27 @@
# persistent data location
root = "/var/lib/containerd"
# runtime state information
state = "/run/docker/libcontainerd/containerd"
# set containerd as a subreaper on linux when it is not running as PID 1
subreaper = true
# set containerd's OOM score
oom_score = -999
# grpc configuration
[grpc]
address = "/run/docker/libcontainerd/docker-containerd.sock"
# socket uid
uid = 0
# socket gid
gid = 0
[plugins.linux]
# shim binary name/path
shim = "containerd-shim"
# runtime binary name/path
runtime = "runc"
# do not use a shim when starting containers, saves on memory but
# live restore is not supported
no_shim = false
# display shim logs in the containerd daemon's log output
shim_debug = true

20
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service vendored Normal file
View File

@ -0,0 +1,20 @@
[Unit]
Description=containerd container runtime
Documentation=https://containerd.io
After=network.target
[Service]
Delegate=yes
Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml
ExecStart=/usr/bin/containerd --config ${TORCX_UNPACKDIR}${TORCX_IMAGEDIR}${CONTAINERD_CONFIG}
KillMode=process
Restart=always
# (lack of) limits from the upstream docker service unit
LimitNOFILE=1048576
LimitNPROC=infinity
LimitCORE=infinity
TasksMax=infinity
[Install]
WantedBy=multi-user.target

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

@ -1,2 +1,2 @@
DIST docker-17.09.0.tar.gz 10132253 SHA256 ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638 WHIRLPOOL ca96166ff3573138713d3d45fcfc42cfed99a70e9db17a1763a9e157e6ce3f301fd01ab3c579aacfcbcab7639986e97bbbbc680fbc65edd76047aee079239b6b
DIST docker-17.10.0.tar.gz 10252333 SHA256 90f54b988d5241ee0472800e139e0628ae8a58dac168bb32fdb031383f3b46be SHA512 4ec5dae379ecda36b9af7066432507947142631efea471cd7f447677f9db1fe1522fe81ef68b28d3e63b5e759535a1c518ce1ef71f4de0e9dd32c957c682098c WHIRLPOOL 5e8278c663f0a0e793c2f439ce84e541371a45e605f78194a86ab3da4922400d8ef7101b5534ac35927381a658a88929c9a83a8ffee0f984488edb5a3c993eae
DIST docker-17.11.0.tar.gz 10649392 SHA256 6b0c1596107fcfd824ef6293437130dbf0f6e1ca5b139c221f67044c8b0b3169 SHA512 b9444775fd7bca1e1ec5b2fdeba063f7a7ead4a5b1fd60c836f42f98a8fe9a3a2fe963332e225491280772c9e4024fec5ebfa9b89ab9fa1b83cd60b5afd0333e WHIRLPOOL ecb85d1dfb3eec935c6013e9fbcf14560d9743949ad4ac3169ebd55ee472e25db1a2bfb552946a2f37e4836a5176d2e987f5dad5fe503bea38b0664af91997d1

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.10.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.11.0.ebuild vendored
View File

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

@ -19,7 +19,7 @@ else
else
MY_PV="$PV-ce"
fi
DOCKER_GITCOMMIT="afdb6d4"
DOCKER_GITCOMMIT="1caf76c"
SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
@ -64,7 +64,7 @@ RDEPEND="
>=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9
=app-emulation/containerd-0.2.9_p27[seccomp?]
=app-emulation/containerd-1.0.0_beta2_p53[seccomp?]
=app-emulation/docker-runc-1.0.0_rc4_p104[apparmor?,seccomp?]
app-emulation/docker-proxy
container-init? ( >=sys-process/tini-0.13.1 )

4
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.10.ebuild → sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.11.ebuild vendored
View File

@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image.
RDEPEND="
=app-emulation/docker-17.10.0
=app-emulation/containerd-0.2.9_p27
=app-emulation/docker-17.11.0
=app-emulation/containerd-1.0.0_beta2_p53
=app-emulation/docker-proxy-0.8.0_p20170917
=app-emulation/docker-runc-1.0.0_rc4_p104
=dev-libs/libltdl-2.4.6

0
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-17.10-manifest.json → sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-17.11-manifest.json vendored
View File

0
sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.7.0.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.7.0-r1.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-9999.ebuild vendored
View File

@ -6,7 +6,7 @@ CROS_WORKON_PROJECT="coreos/mantle"
CROS_WORKON_LOCALNAME="mantle"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/mantle"
COREOS_GO_VERSION="go1.8"
COREOS_GO_VERSION="go1.9"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm64"

3
sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest vendored
View File

@ -1,4 +1,5 @@
DIST go1.5.4.src.tar.gz 12059752 SHA256 002acabce7ddc140d0d55891f9d4fcfbdd806b9332fb8b110c91bc91afb0bc93 SHA512 bff8ad4e792fb92c382327d080f2383e623d39d474317d9b3132167707ced99b7b4866c9ab315b6479eb75891d146b3d71dc0f5a4e81a509090b3205684409ed WHIRLPOOL cd14fc92e513a1ef0882c0dfb28526fa5f8044b99935c7e022b9ca0c10190c8f8a8fb3cb251db280168cfbc00a2a2f25761dfac9b274aa37d2d66bb03360da6f
DIST go1.6.3.src.tar.gz 12617426 SHA256 6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 WHIRLPOOL 0a22dc08b89ddfaccf1e871037e7ad6cdbf36f914de527011813d57a2d857478278202314b185e26aa905cb135d13cbea490d03337b42148c6fc2ef93a8cd9fe
DIST go1.7.6.src.tar.gz 14173249 SHA256 1a67a4e688673fdff7ba41e73482b0e59ac5bd0f7acf703bc6d50cc775c5baba SHA512 b01846bfb17bf91a9c493c4d6c43bbe7e17270b9e8a229a2be4032b78ef9395f5512917ea9faab74a120c755bbd53bbd816b033caadcbb7679e91702b37f8c7f WHIRLPOOL 3f45bb07e1630939ade048ee4cb07c581641957e20552995bb0d4becb681caa11432bd74da00eb383fd554c7c5f6b9d900ca1432b445e6a2aa44f4cc52772c76
DIST go1.8.4.src.tar.gz 15348576 SHA256 abf1b2e5ae2a4845f3d2eac00c7382ff209e2c132dc35b7ce753da9b4f52e59f SHA512 7b1954374c3f87b48246a58906bb2c50d6cf24fbb6e64abed2aef373ac22b35bdfe60e3e9b609e4daba8a91181abba2d62da1aa427f3c3c3bc6944939a40c156 WHIRLPOOL f861f4008842343b2935c65b9da8290f5c87798e22773ad68d512d3a0107c3e14f52ce8d7ff9f32865bc4f3439906a11f5191f911785c8ce1631cdd58bae81a3
DIST go1.8.5.src.tar.gz 15351865 SHA256 4949fd1a5a4954eb54dd208f2f412e720e23f32c91203116bed0387cf5d0ff2d SHA512 26723597a5d3631b71fbcfdb39621f3322d8550b24aec7f6f1554cbc30cb52b66b8fff4c1d717c37b5be98d7b0eff538285d232a5f7e44e100357aed015e62ad WHIRLPOOL 90e35f22296f68a583ad6e203314a2e54f22fa92838162e7ebce23cef3f53f8423aa2029bf95d2a6e7adf777429be762c4a37fce8a21f651f3cd50367eeebe81
DIST go1.9.2.src.tar.gz 16383591 SHA256 665f184bf8ac89986cfd5a4460736976f60b57df6b320ad71ad4cef53bb143dc SHA512 1034098575c317eeaf648629690a4dea0c479a69c3b80d9917f6b96c8781ce79c0f29859f667dc4e07d47a44972aa09bd0163a458f897cf45f9d09eb03e4abb5 WHIRLPOOL f9a009e1befa29ff93a2a1f942276b932f7d96a95f027b99c04f8d56317cfeebcfb779f36ddb46801a8e7646fdd0be57a39b2a3c04886c09f1799bc4e6752af0

0
sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.8.4.ebuild → sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.8.5.ebuild vendored
View File

8
sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.9.2.ebuild vendored Normal file
View File

@ -0,0 +1,8 @@
# Copyright 2017 CoreOS, Inc.
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit coreos-go-lang
KEYWORDS="-* amd64 arm64"