docker-ce: bump SRCREV_docker
PATCH 1/1 docker-ce: bump SRCREV_docker
* fix my prevous commit where I've missed this update corresponding to SRCREV_moby change in docker-moby recipe.
* also re-order the patches in SRC_URI to match docker-moby, so that they are easier to compare
--- recipes-containers/docker/docker-ce_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-containers/docker/docker-ce_git.bb +3 -3
@@ -31,7 +31,7 @@ DESCRIPTION = "Linux container runtime \ # so we get that tag, and make it our SRCREVS: # -SRCREV_docker = "3056208812eb5e792fa99736c9167d1e10f4ab49" +SRCREV_docker = "791d8ab87747169b4cbfcdf2fd57c81952bae6d5" SRCREV_libnetwork = "dcdf8f176d1e13ad719e913e796fb698d846de98" SRCREV_cli = "911449ca245308472a3d34a7f1a98b918e65c8c3" SRCREV_FORMAT = "docker_libnetwork"
@@ -39,10 +39,10 @@ SRC_URI = "\ git://github.com/docker/docker.git;branch=20.10;name=docker;protocol=https \ git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \ git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli;protocol=https \ - file://0001-libnetwork-use-GO-instead-of-go.patch \ file://docker.init \ - file://0001-dynbinary-use-go-cross-compiler.patch \ + file://0001-libnetwork-use-GO-instead-of-go.patch \ file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \ + file://0001-dynbinary-use-go-cross-compiler.patch \ file://0001-Revert-go-updates-from-1.19.12-to-1.18.7.patch;patchdir=src/import \ file://0002-Revert-go-updates-from-1.18.7-to-1.17.13.patch;patchdir=src/import \ file://0003-builder.go-avoid-using-strings.Cut-from-go-1.18.patch;patchdir=src/import \
Signature · 1 line
2.41.0
Thanks Martin,
This is merged.
Bruce
Quoted 50 lines · Martin Jansa
* fix my prevous commit where I've missed this update corresponding to
SRCREV_mobychange in docker-moby recipe.* also re-order the patches in
SRC_URIto match docker-moby, so that they are easier to compareSigned-off-by Martin Jansa <[email protected]>--- recipes-containers/docker/docker-ce_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)recipes-containers/docker/docker-ce_git.bb +3
-4@@ -31,7 +31,7 @@ DESCRIPTION = "Linux container runtime \ # so we get that tag, and make it our SRCREVS: # -SRCREV_docker = "3056208812eb5e792fa99736c9167d1e10f4ab49" +SRCREV_docker = "791d8ab87747169b4cbfcdf2fd57c81952bae6d5" SRCREV_libnetwork = "dcdf8f176d1e13ad719e913e796fb698d846de98" SRCREV_cli = "911449ca245308472a3d34a7f1a98b918e65c8c3" SRCREV_FORMAT = "docker_libnetwork"@@ -39,10 +39,10 @@ SRC_URI = "\ git://github.com/docker/docker.git;branch=20.10;name=docker;protocol=https \ git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \ git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli;protocol=https \ - file://0001-libnetwork-use-GO-instead-of-go.patch \ file://docker.init \ - file://0001-dynbinary-use-go-cross-compiler.patch \ + file://0001-libnetwork-use-GO-instead-of-go.patch \ file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \ + file://0001-dynbinary-use-go-cross-compiler.patch \ file://0001-Revert-go-updates-from-1.19.12-to-1.18.7.patch;patchdir=src/import \ file://0002-Revert-go-updates-from-1.18.7-to-1.17.13.patch;patchdir=src/import \ file://0003-builder.go-avoid-using-strings.Cut-from-go-1.18.patch;patchdir=src/import \ --2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8196): https://lists.yoctoproject.org/g/meta-virtualization/message/8196
Mute This Topic: https://lists.yoctoproject.org/mt/100774437/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
Hi Bruce,
It seems docker in Dunfell is also affected with the same 'http: invalid Host header' issue. Can these patches be merged into Dunfell as well?
Thanks,
Abdurrahman
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Bruce Ashfield
Sent: Wednesday, August 16, 2023 6:36 AM
To: Martin Jansa <[email protected]>
Cc: [email protected]
Subject: Re: [meta-virtualization] [kirkstone][PATCH] docker-ce: bump SRCREV_docker
Thanks Martin,
This is merged.
Bruce
Quoted 40 lines · Martin Jansa
* fix my prevous commit where I've missed this update corresponding to
SRCREV_mobychange in docker-moby recipe.* also re-order the patches in
SRC_URIto match docker-moby, so that they are easier to compareSigned-off-by Martin Jansa <[email protected]>--- recipes-containers/docker/docker-ce_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)recipes-containers/docker/docker-ce_git.bb +0
-0@@ -31,7 +31,7 @@ DESCRIPTION = "Linux container runtime \ # so weget that tag, and make it our SRCREVS:
#recipes-containers/docker/docker-ce_git.bb +3
-3-SRCREV_docker = "3056208812eb5e792fa99736c9167d1e10f4ab49" +SRCREV_docker = "791d8ab87747169b4cbfcdf2fd57c81952bae6d5" SRCREV_libnetwork = "dcdf8f176d1e13ad719e913e796fb698d846de98" SRCREV_cli = "911449ca245308472a3d34a7f1a98b918e65c8c3" SRCREV_FORMAT = "docker_libnetwork"@@ -39,10 +39,10 @@ SRC_URI = "\ git://github.com/docker/docker.git;branch=20.10;name=docker;protocol=https \ git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \ git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli;protocol=https \ - file://0001-libnetwork-use-GO-instead-of-go.patch \ file://docker.init \ - file://0001-dynbinary-use-go-cross-compiler.patch \ + file://0001-libnetwork-use-GO-instead-of-go.patch \ file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \ + file://0001-dynbinary-use-go-cross-compiler.patch \ file://0001-Revert-go-updates-from-1.19.12-to-1.18.7.patch;patchdir=src/import \ file://0002-Revert-go-updates-from-1.18.7-to-1.17.13.patch;patchdir=src/import \
Quoted 8 lines
file://0003-builder.go-avoid-using-strings.Cut-from-go-1.18.patch;patc hdir=src/import \
--
2.41.0
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
In message: RE: [meta-virtualization] [kirkstone][PATCH] docker-ce: bump SRCREV_docker
Quoted 4 lines · on 03/09/2023 Abdurrahman Hussain (fib) wrote:
Hi Bruce,
It seems docker in Dunfell is also affected with the same 'http: invalid Host header' issue. Can these patches be merged into Dunfell as well?
If the patches were simply cherry picked, that would involve a major docker version change, which isn't something we'd typically do.
We need a specific / tested patch for dunfell for proper consideration.
Bruce
Quoted 71 lines
Thanks,
Abdurrahman-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Bruce Ashfield
Sent: Wednesday, August 16, 2023 6:36 AM
To: Martin Jansa <[email protected]>
Cc: [email protected]
Subject: Re: [meta-virtualization] [kirkstone][PATCH] docker-ce: bumpSRCREV_dockerThanks Martin,
This is merged.
Bruce
Quoted 40 lines · Martin Jansa
* fix my prevous commit where I've missed this update corresponding to
SRCREV_mobychange in docker-moby recipe.* also re-order the patches in
SRC_URIto match docker-moby, so that they are easier to compareSigned-off-by Martin Jansa <[email protected]>--- recipes-containers/docker/docker-ce_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)recipes-containers/docker/docker-ce_git.bb +0
-0@@ -31,7 +31,7 @@ DESCRIPTION = "Linux container runtime \ # so weget that tag, and make it our SRCREVS:
#recipes-containers/docker/docker-ce_git.bb +3
-3-SRCREV_docker = "3056208812eb5e792fa99736c9167d1e10f4ab49" +SRCREV_docker = "791d8ab87747169b4cbfcdf2fd57c81952bae6d5" SRCREV_libnetwork = "dcdf8f176d1e13ad719e913e796fb698d846de98" SRCREV_cli = "911449ca245308472a3d34a7f1a98b918e65c8c3" SRCREV_FORMAT = "docker_libnetwork"@@ -39,10 +39,10 @@ SRC_URI = "\ git://github.com/docker/docker.git;branch=20.10;name=docker;protocol=https \ git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork;protocol=https \ git://github.com/docker/cli;branch=20.10;name=cli;destsuffix=git/cli;protocol=https \ - file://0001-libnetwork-use-GO-instead-of-go.patch \ file://docker.init \ - file://0001-dynbinary-use-go-cross-compiler.patch \ + file://0001-libnetwork-use-GO-instead-of-go.patch \ file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \ + file://0001-dynbinary-use-go-cross-compiler.patch \ file://0001-Revert-go-updates-from-1.19.12-to-1.18.7.patch;patchdir=src/import \ file://0002-Revert-go-updates-from-1.18.7-to-1.17.13.patch;patchdir=src/import \Quoted 8 lines
file://0003-builder.go-avoid-using-strings.Cut-from-go-1.18.patch;patc hdir=src/import \
--
2.41.0--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II