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

Merge pull request #2418 from dm0-/docker

Browse Source 
Upgrade to Docker 1.13.1
This commit is contained in:
David Michael 2017-02-14 13:26:29 -08:00 committed by GitHub
commit 355d0dc88c
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r2.ebuild vendored
View File

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

@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://${GITHUB_URI}.git" EGIT_REPO_URI="https://${GITHUB_URI}.git"
inherit git-r3 inherit git-r3
else else
EGIT_COMMIT="03e5862ec0d8d3b3f750e19fca3ee367e13c090e" EGIT_COMMIT="aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1"
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 vcs-snapshot inherit vcs-snapshot

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

2
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="bd248c13a16ae08b9c3fa871a361c4177c9840ea" # coreos-1.13.0 CROS_WORKON_COMMIT="092cba3727bb9b4a2f0e922cd6c0f93ea270e363" # coreos-1.13.1
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi

4
sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r4.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r5.ebuild vendored
View File

@ -8,9 +8,9 @@ GITHUB_URI="github.com/opencontainers/runc"
COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.6" COREOS_GO_VERSION="go1.6"
# the commit of runc that docker uses. # the commit of runc that docker uses.
# see https://github.com/docker/docker/blob/v1.13.0/hack/dockerfile/binaries-commits#L4 # see https://github.com/docker/docker/blob/v1.13.1/hack/dockerfile/binaries-commits#L6
# Note: this commit is only really present in `docker/runc` in the 'docker/1.13.x' branch # Note: this commit is only really present in `docker/runc` in the 'docker/1.13.x' branch
COMMIT_ID="2f7393a47307a16f8cee44a37b262e8b81021e3e" COMMIT_ID="9df8b306d01f59d3a8029be411de015b7304dd8f"
inherit eutils flag-o-matic coreos-go-depend vcs-snapshot inherit eutils flag-o-matic coreos-go-depend vcs-snapshot