diff options
| -rw-r--r-- | recipes-containers/docker/docker-ce_git.bb | 8 | ||||
| -rw-r--r-- | recipes-containers/docker/docker-moby.bb | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb index 3c8a339f..e32a7341 100644 --- a/recipes-containers/docker/docker-ce_git.bb +++ b/recipes-containers/docker/docker-ce_git.bb | |||
| @@ -18,11 +18,11 @@ DESCRIPTION = "Linux container runtime \ | |||
| 18 | subtle and/or glaring issues. \ | 18 | subtle and/or glaring issues. \ |
| 19 | " | 19 | " |
| 20 | 20 | ||
| 21 | SRCREV_docker = "633a0ea838f10e000b7c6d6eed1623e6e988b5bb" | 21 | SRCREV_docker = "f0e27e52c1d57597a9b2e50baad33feb80474b76" |
| 22 | SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381" | 22 | SRCREV_libnetwork = "9fd385be8302dbe1071a3ce124891893ff27f90f" |
| 23 | SRC_URI = "\ | 23 | SRC_URI = "\ |
| 24 | git://github.com/docker/docker-ce.git;branch=19.03;name=docker \ | 24 | git://github.com/docker/docker-ce.git;branch=19.03;name=docker \ |
| 25 | git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \ | 25 | git://github.com/docker/libnetwork.git;branch=bump_19.03;name=libnetwork;destsuffix=git/libnetwork \ |
| 26 | file://0001-libnetwork-use-GO-instead-of-go.patch \ | 26 | file://0001-libnetwork-use-GO-instead-of-go.patch \ |
| 27 | file://docker.init \ | 27 | file://docker.init \ |
| 28 | file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \ | 28 | file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \ |
| @@ -38,7 +38,7 @@ GO_IMPORT = "import" | |||
| 38 | 38 | ||
| 39 | S = "${WORKDIR}/git" | 39 | S = "${WORKDIR}/git" |
| 40 | 40 | ||
| 41 | DOCKER_VERSION = "19.03.5-ce" | 41 | DOCKER_VERSION = "19.03.6-ce" |
| 42 | PV = "${DOCKER_VERSION}+git${SRCREV_docker}" | 42 | PV = "${DOCKER_VERSION}+git${SRCREV_docker}" |
| 43 | 43 | ||
| 44 | PACKAGES =+ "${PN}-contrib" | 44 | PACKAGES =+ "${PN}-contrib" |
diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb index 0e1f4e2c..b29c4b34 100644 --- a/recipes-containers/docker/docker-moby.bb +++ b/recipes-containers/docker/docker-moby.bb | |||
| @@ -35,12 +35,12 @@ DESCRIPTION = "Linux container runtime \ | |||
| 35 | # to a docker.inc recipe | 35 | # to a docker.inc recipe |
| 36 | 36 | ||
| 37 | # moby commit matches the docker-engine bump on the 19.03 branch' | 37 | # moby commit matches the docker-engine bump on the 19.03 branch' |
| 38 | SRCREV_moby = "08bc39c8f9e1ccdc5ff18f6e751105722cecc4a9" | 38 | SRCREV_moby = "71373c6105e3cbc9702935b96d8ee01214c405e7" |
| 39 | SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381" | 39 | SRCREV_libnetwork = "9fd385be8302dbe1071a3ce124891893ff27f90f" |
| 40 | SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d" | 40 | SRCREV_cli = "3ff19c37551bb0ce3025eb29655337f1ff433a00" |
| 41 | SRC_URI = "\ | 41 | SRC_URI = "\ |
| 42 | git://github.com/moby/moby.git;nobranch=1;name=moby \ | 42 | git://github.com/moby/moby.git;branch=19.03;name=moby \ |
| 43 | git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \ | 43 | git://github.com/docker/libnetwork.git;branch=bump_19.03;name=libnetwork;destsuffix=git/libnetwork \ |
| 44 | git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \ | 44 | git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \ |
| 45 | file://docker.init \ | 45 | file://docker.init \ |
| 46 | file://0001-libnetwork-use-GO-instead-of-go.patch \ | 46 | file://0001-libnetwork-use-GO-instead-of-go.patch \ |
| @@ -56,7 +56,7 @@ GO_IMPORT = "import" | |||
| 56 | 56 | ||
| 57 | S = "${WORKDIR}/git" | 57 | S = "${WORKDIR}/git" |
| 58 | 58 | ||
| 59 | DOCKER_VERSION = "19.03.2" | 59 | DOCKER_VERSION = "19.03.6" |
| 60 | PV = "${DOCKER_VERSION}+git${SRCREV_moby}" | 60 | PV = "${DOCKER_VERSION}+git${SRCREV_moby}" |
| 61 | 61 | ||
| 62 | PACKAGES =+ "${PN}-contrib" | 62 | PACKAGES =+ "${PN}-contrib" |
