summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/docker_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/docker/docker_git.bb')
-rw-r--r--recipes-containers/docker/docker_git.bb11
1 files changed, 6 insertions, 5 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index cb546161..8bcaee9b 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -18,9 +18,9 @@ DESCRIPTION = "Linux container runtime \
18 subtle and/or glaring issues. \ 18 subtle and/or glaring issues. \
19 " 19 "
20 20
21SRCREV = "2243e32cbbf1c9809c262a7376d34ca43a7a36dc" 21SRCREV = "7c8fca2ddb58c8d2c4fb4df31c242886df7dd257"
22SRC_URI = "\ 22SRC_URI = "\
23 git://github.com/docker/docker.git \ 23 git://github.com/docker/docker.git;branch=release \
24 file://docker.service \ 24 file://docker.service \
25 file://docker.init \ 25 file://docker.init \
26 file://hi.Dockerfile \ 26 file://hi.Dockerfile \
@@ -38,7 +38,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1cc0497778922bfd6cb48721deb80dc7"
38 38
39S = "${WORKDIR}/git" 39S = "${WORKDIR}/git"
40 40
41DOCKER_VERSION = "1.5.0" 41DOCKER_VERSION = "1.6.2"
42PV = "${DOCKER_VERSION}+git${SRCREV}" 42PV = "${DOCKER_VERSION}+git${SRCREV}"
43 43
44DEPENDS = "golang-cross \ 44DEPENDS = "golang-cross \
@@ -57,6 +57,7 @@ DEPENDS = "golang-cross \
57 go-systemd \ 57 go-systemd \
58 btrfs-tools \ 58 btrfs-tools \
59 sqlite3 \ 59 sqlite3 \
60 go-distribution-digest \
60 " 61 "
61 62
62DEPENDS_append_class-target = "lvm2" 63DEPENDS_append_class-target = "lvm2"
@@ -110,9 +111,9 @@ INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
110 111
111do_install() { 112do_install() {
112 mkdir -p ${D}/${bindir} 113 mkdir -p ${D}/${bindir}
113 cp ${S}/bundles/${DOCKER_VERSION}-dev/dynbinary/docker-${DOCKER_VERSION}-dev \ 114 cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} \
114 ${D}/${bindir}/docker 115 ${D}/${bindir}/docker
115 cp ${S}/bundles/${DOCKER_VERSION}-dev/dynbinary/dockerinit-${DOCKER_VERSION}-dev \ 116 cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/dockerinit-${DOCKER_VERSION} \
116 ${D}/${bindir}/dockerinit 117 ${D}/${bindir}/dockerinit
117 118
118 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 119 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then