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 #1581 from marineam/update

Browse Source 
Docker 1.8.3, coreos-install default to stable
This commit is contained in:
Michael Marineau 2015-10-12 12:23:06 -07:00
commit 79c7738dae
4 changed files with 2 additions and 2 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/docker/docker-1.8.2-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3.ebuild vendored
View File

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

@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="unknown" DOCKER_GITCOMMIT="unknown"
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="fae44362ed4c7e161ab52f6bba6d5ee93ffbc28f" # v1.8.2 with backports CROS_WORKON_COMMIT="cedd53482c5a3ce88f3bb98d1d325dae4c95d9b6" # v1.8.3 with backports
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64" KEYWORDS="amd64"
fi fi

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r115.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r116.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="3956ca786980886ec3007e278e79bc03b3e7b812" CROS_WORKON_COMMIT="fb44152c1a61707a22f51364845943446894d440"
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi