diff options
Diffstat (limited to 'recipes-containers/docker/docker_git.bb')
-rw-r--r-- | recipes-containers/docker/docker_git.bb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index b3673d43..f63cee16 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb | |||
@@ -18,27 +18,26 @@ DESCRIPTION = "Linux container runtime \ | |||
18 | subtle and/or glaring issues. \ | 18 | subtle and/or glaring issues. \ |
19 | " | 19 | " |
20 | 20 | ||
21 | SRCREV_docker = "708b068d3095c6a6be939eb2da78c921d2e945e2" | 21 | SRCREV_docker = "489b8eda6674523df8b82a210399b7d2954427d0" |
22 | SRCREV_libnetwork = "4cb38c2987c236dce03c868d99b57b1e28a4b81c" | 22 | SRCREV_libnetwork = "6da50d1978302f04c3e2089e29112ea24812f05b" |
23 | SRCREV_cli = "0f1bb353423e45e02315e985bd9ddebe6da18457" | 23 | SRCREV_cli = "51668a30f26250ccfce31bcc13d9334eaafabe36" |
24 | SRC_URI = "\ | 24 | SRC_URI = "\ |
25 | git://github.com/moby/moby.git;nobranch=1;name=docker \ | 25 | git://github.com/moby/moby.git;nobranch=1;name=docker \ |
26 | git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \ | 26 | git://github.com/docker/libnetwork.git;branch=bump_18.09;name=libnetwork;destsuffix=git/libnetwork \ |
27 | git://github.com/docker/cli;branch=master;name=cli;destsuffix=git/cli \ | 27 | git://github.com/docker/cli;branch=18.09;name=cli;destsuffix=git/cli \ |
28 | file://docker.init \ | 28 | file://docker.init \ |
29 | file://hi.Dockerfile \ | ||
30 | file://0001-libnetwork-use-GO-instead-of-go.patch \ | 29 | file://0001-libnetwork-use-GO-instead-of-go.patch \ |
31 | " | 30 | " |
32 | 31 | ||
33 | # Apache-2.0 for docker | 32 | # Apache-2.0 for docker |
34 | LICENSE = "Apache-2.0" | 33 | LICENSE = "Apache-2.0" |
35 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=9740d093a080530b5c5c6573df9af45a" | 34 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28" |
36 | 35 | ||
37 | GO_IMPORT = "import" | 36 | GO_IMPORT = "import" |
38 | 37 | ||
39 | S = "${WORKDIR}/git" | 38 | S = "${WORKDIR}/git" |
40 | 39 | ||
41 | DOCKER_VERSION = "18.03.0" | 40 | DOCKER_VERSION = "18.09.0" |
42 | PV = "${DOCKER_VERSION}+git${SRCREV_docker}" | 41 | PV = "${DOCKER_VERSION}+git${SRCREV_docker}" |
43 | 42 | ||
44 | DEPENDS = " \ | 43 | DEPENDS = " \ |
@@ -157,7 +156,6 @@ do_install() { | |||
157 | fi | 156 | fi |
158 | 157 | ||
159 | mkdir -p ${D}${datadir}/docker/ | 158 | mkdir -p ${D}${datadir}/docker/ |
160 | cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/ | ||
161 | install -m 0755 ${S}/src/import/contrib/check-config.sh ${D}${datadir}/docker/ | 159 | install -m 0755 ${S}/src/import/contrib/check-config.sh ${D}${datadir}/docker/ |
162 | } | 160 | } |
163 | 161 | ||