* [meta-virtualization][PATCH] docker-ce: update to v19.03.5
@ 2020-01-09 15:15 Stefan Agner
2020-01-15 19:26 ` Bruce Ashfield
2020-01-17 21:30 ` Bruce Ashfield
0 siblings, 2 replies; 5+ messages in thread
From: Stefan Agner @ 2020-01-09 15:15 UTC (permalink / raw)
To: meta-virtualization; +Cc: Stefan Agner
From: Stefan Agner <stefan.agner@toradex.com>
Bump the git hashes to Docker CE v19.03.5. This requires to get the
docker daemon binary from a different location as the symlink from
the latest/ subdirectory has been removed. See also commit deaac5d4b3fa
("hack/make.sh remove "latest" symlink") in the docker-ce repository.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
recipes-containers/docker/docker-ce_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index 817795f..0d088da 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
subtle and/or glaring issues. \
"
-SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
+SRCREV_docker = "633a0ea838f10e000b7c6d6eed1623e6e988b5bb"
SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
SRC_URI = "\
git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
S = "${WORKDIR}/git"
-DOCKER_VERSION = "19.03.2-ce"
+DOCKER_VERSION = "19.03.5-ce"
PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
PACKAGES =+ "${PN}-contrib"
@@ -99,7 +99,7 @@ do_compile() {
do_install() {
mkdir -p ${D}/${bindir}
cp ${S}/src/import/components/cli/build/docker ${D}/${bindir}/docker
- cp ${S}/src/import/components/engine/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
+ cp ${S}/src/import/components/engine/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] docker-ce: update to v19.03.5
2020-01-09 15:15 [meta-virtualization][PATCH] docker-ce: update to v19.03.5 Stefan Agner
@ 2020-01-15 19:26 ` Bruce Ashfield
2020-01-15 20:46 ` Stefan Agner
2020-01-17 21:30 ` Bruce Ashfield
1 sibling, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2020-01-15 19:26 UTC (permalink / raw)
To: Stefan Agner; +Cc: meta-virtualization, Stefan Agner
Sorry for the delays on this. I'm working through some kernel issues.
I do expect to have this merged in the next couple of days (I just
want to sync moby, and run some tests first).
Bruce
On Thu, Jan 9, 2020 at 10:15 AM Stefan Agner <stefan@agner.ch> wrote:
>
> From: Stefan Agner <stefan.agner@toradex.com>
>
> Bump the git hashes to Docker CE v19.03.5. This requires to get the
> docker daemon binary from a different location as the symlink from
> the latest/ subdirectory has been removed. See also commit deaac5d4b3fa
> ("hack/make.sh remove "latest" symlink") in the docker-ce repository.
>
> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> ---
> recipes-containers/docker/docker-ce_git.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
> index 817795f..0d088da 100644
> --- a/recipes-containers/docker/docker-ce_git.bb
> +++ b/recipes-containers/docker/docker-ce_git.bb
> @@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
> subtle and/or glaring issues. \
> "
>
> -SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
> +SRCREV_docker = "633a0ea838f10e000b7c6d6eed1623e6e988b5bb"
> SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
> SRC_URI = "\
> git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
> @@ -38,7 +38,7 @@ GO_IMPORT = "import"
>
> S = "${WORKDIR}/git"
>
> -DOCKER_VERSION = "19.03.2-ce"
> +DOCKER_VERSION = "19.03.5-ce"
> PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
>
> PACKAGES =+ "${PN}-contrib"
> @@ -99,7 +99,7 @@ do_compile() {
> do_install() {
> mkdir -p ${D}/${bindir}
> cp ${S}/src/import/components/cli/build/docker ${D}/${bindir}/docker
> - cp ${S}/src/import/components/engine/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
> + cp ${S}/src/import/components/engine/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
> cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
>
> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> --
> 2.17.1
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] docker-ce: update to v19.03.5
2020-01-15 19:26 ` Bruce Ashfield
@ 2020-01-15 20:46 ` Stefan Agner
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Agner @ 2020-01-15 20:46 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization, Stefan Agner
No problem, not really urgent from my side.
I also have some podman updates I am working on, will probably send
soon.
--
Stefan
On 2020-01-15 20:26, Bruce Ashfield wrote:
> Sorry for the delays on this. I'm working through some kernel issues.
> I do expect to have this merged in the next couple of days (I just
> want to sync moby, and run some tests first).
>
> Bruce
>
> On Thu, Jan 9, 2020 at 10:15 AM Stefan Agner <stefan@agner.ch> wrote:
>>
>> From: Stefan Agner <stefan.agner@toradex.com>
>>
>> Bump the git hashes to Docker CE v19.03.5. This requires to get the
>> docker daemon binary from a different location as the symlink from
>> the latest/ subdirectory has been removed. See also commit deaac5d4b3fa
>> ("hack/make.sh remove "latest" symlink") in the docker-ce repository.
>>
>> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
>> ---
>> recipes-containers/docker/docker-ce_git.bb | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
>> index 817795f..0d088da 100644
>> --- a/recipes-containers/docker/docker-ce_git.bb
>> +++ b/recipes-containers/docker/docker-ce_git.bb
>> @@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
>> subtle and/or glaring issues. \
>> "
>>
>> -SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
>> +SRCREV_docker = "633a0ea838f10e000b7c6d6eed1623e6e988b5bb"
>> SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
>> SRC_URI = "\
>> git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
>> @@ -38,7 +38,7 @@ GO_IMPORT = "import"
>>
>> S = "${WORKDIR}/git"
>>
>> -DOCKER_VERSION = "19.03.2-ce"
>> +DOCKER_VERSION = "19.03.5-ce"
>> PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
>>
>> PACKAGES =+ "${PN}-contrib"
>> @@ -99,7 +99,7 @@ do_compile() {
>> do_install() {
>> mkdir -p ${D}/${bindir}
>> cp ${S}/src/import/components/cli/build/docker ${D}/${bindir}/docker
>> - cp ${S}/src/import/components/engine/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
>> + cp ${S}/src/import/components/engine/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
>> cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
>>
>> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
>> --
>> 2.17.1
>>
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] docker-ce: update to v19.03.5
2020-01-09 15:15 [meta-virtualization][PATCH] docker-ce: update to v19.03.5 Stefan Agner
2020-01-15 19:26 ` Bruce Ashfield
@ 2020-01-17 21:30 ` Bruce Ashfield
2020-01-17 22:17 ` Stefan Agner
1 sibling, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2020-01-17 21:30 UTC (permalink / raw)
To: Stefan Agner; +Cc: meta-virtualization, Stefan Agner
Similar to the podman patches, I've merged this to master.
But I'm not really seeing a compelling security or serious bug fix
that makes it something I'd want to also apply to Zeus.
Again, I'm open to being convinced.
Bruce
On Thu, Jan 9, 2020 at 10:15 AM Stefan Agner <stefan@agner.ch> wrote:
>
> From: Stefan Agner <stefan.agner@toradex.com>
>
> Bump the git hashes to Docker CE v19.03.5. This requires to get the
> docker daemon binary from a different location as the symlink from
> the latest/ subdirectory has been removed. See also commit deaac5d4b3fa
> ("hack/make.sh remove "latest" symlink") in the docker-ce repository.
>
> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> ---
> recipes-containers/docker/docker-ce_git.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
> index 817795f..0d088da 100644
> --- a/recipes-containers/docker/docker-ce_git.bb
> +++ b/recipes-containers/docker/docker-ce_git.bb
> @@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
> subtle and/or glaring issues. \
> "
>
> -SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
> +SRCREV_docker = "633a0ea838f10e000b7c6d6eed1623e6e988b5bb"
> SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
> SRC_URI = "\
> git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
> @@ -38,7 +38,7 @@ GO_IMPORT = "import"
>
> S = "${WORKDIR}/git"
>
> -DOCKER_VERSION = "19.03.2-ce"
> +DOCKER_VERSION = "19.03.5-ce"
> PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
>
> PACKAGES =+ "${PN}-contrib"
> @@ -99,7 +99,7 @@ do_compile() {
> do_install() {
> mkdir -p ${D}/${bindir}
> cp ${S}/src/import/components/cli/build/docker ${D}/${bindir}/docker
> - cp ${S}/src/import/components/engine/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
> + cp ${S}/src/import/components/engine/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
> cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
>
> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> --
> 2.17.1
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-virtualization][PATCH] docker-ce: update to v19.03.5
2020-01-17 21:30 ` Bruce Ashfield
@ 2020-01-17 22:17 ` Stefan Agner
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Agner @ 2020-01-17 22:17 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization, Stefan Agner
On 2020-01-17 22:30, Bruce Ashfield wrote:
> Similar to the podman patches, I've merged this to master.
>
> But I'm not really seeing a compelling security or serious bug fix
> that makes it something I'd want to also apply to Zeus.
There is a security fix listed in the release notes (CVE-2017-18367),
but I think it does not apply since we do not build runc from docker-ce
repository, so I agree there is no serious security issue fixed which
would warrant the update.
There were two bug fixes which caught my attention:
- Docker 19.03 doesn't support OCI image #39727
- Fix panic on 32-bit ARMv7 caused by misaligned struct member.
docker/engine#363
I haven't hit either one of them. But not supporting OCI image standard
sounds uncool, and we run an ARMv7 so quite likely we would hit that one
sooner or later.
So I probably will go for the update in our distro.
--
Stefan
>
> Again, I'm open to being convinced.
>
> Bruce
>
> On Thu, Jan 9, 2020 at 10:15 AM Stefan Agner <stefan@agner.ch> wrote:
>>
>> From: Stefan Agner <stefan.agner@toradex.com>
>>
>> Bump the git hashes to Docker CE v19.03.5. This requires to get the
>> docker daemon binary from a different location as the symlink from
>> the latest/ subdirectory has been removed. See also commit deaac5d4b3fa
>> ("hack/make.sh remove "latest" symlink") in the docker-ce repository.
>>
>> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
>> ---
>> recipes-containers/docker/docker-ce_git.bb | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
>> index 817795f..0d088da 100644
>> --- a/recipes-containers/docker/docker-ce_git.bb
>> +++ b/recipes-containers/docker/docker-ce_git.bb
>> @@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
>> subtle and/or glaring issues. \
>> "
>>
>> -SRCREV_docker = "6a30dfca03664a0b6bf0646a7d389ee7d0318e6e"
>> +SRCREV_docker = "633a0ea838f10e000b7c6d6eed1623e6e988b5bb"
>> SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
>> SRC_URI = "\
>> git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
>> @@ -38,7 +38,7 @@ GO_IMPORT = "import"
>>
>> S = "${WORKDIR}/git"
>>
>> -DOCKER_VERSION = "19.03.2-ce"
>> +DOCKER_VERSION = "19.03.5-ce"
>> PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
>>
>> PACKAGES =+ "${PN}-contrib"
>> @@ -99,7 +99,7 @@ do_compile() {
>> do_install() {
>> mkdir -p ${D}/${bindir}
>> cp ${S}/src/import/components/cli/build/docker ${D}/${bindir}/docker
>> - cp ${S}/src/import/components/engine/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
>> + cp ${S}/src/import/components/engine/bundles/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
>> cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
>>
>> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
>> --
>> 2.17.1
>>
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-17 22:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-09 15:15 [meta-virtualization][PATCH] docker-ce: update to v19.03.5 Stefan Agner
2020-01-15 19:26 ` Bruce Ashfield
2020-01-15 20:46 ` Stefan Agner
2020-01-17 21:30 ` Bruce Ashfield
2020-01-17 22:17 ` Stefan Agner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.