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 #1244 from marineam/docker

Browse Source 
Bump docker to v1.6.1-rc2
This commit is contained in:
Michael Marineau 2015-05-07 14:52:12 -07:00
commit b63285acee
2 changed files with 3 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.6.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.6.1_rc2.ebuild vendored
View File

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

@ -7,7 +7,8 @@ EAPI=5
DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
HOMEPAGE="https://www.docker.com"
CROS_WORKON_PROJECT="dotcloud/docker"
CROS_WORKON_PROJECT="coreos/docker"
#CROS_WORKON_PROJECT="dotcloud/docker"
CROS_WORKON_LOCALNAME="docker"
CROS_WORKON_REPO="git://github.com"
@ -15,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT=""
KEYWORDS=""
else
CROS_WORKON_COMMIT="47496519da9664202d900d3635bb840509fa9647" # v1.6.0
CROS_WORKON_COMMIT="17f157d4d2e1ae080fb946d48976b30a28523ed9" # v1.6.1-rc2
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64"
fi