Skip to contentSkip to conversation

docker-moby/docker-ce: merge into one

PATCH In review [email protected] 2 participants 5 messages Apr 28, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 docker-moby/docker-ce: merge into one

From: Chen Qi <[email protected]>

Things have changed since these two recipe were added. Now
https://github.com/docker/docker has been redirected to
https://github.com/moby/moby. This means the contents of docker-ce_git.bb and docker-moby_git.bb are essentially the same except for some comments.

So let's merge them into one and keep the merged recipe's name docker-moby, as the repo's name is moby.

The PROVIDES and RPROVIDES are added 'docker-ce' for backward compatibility.

---
 conf/layer.conf                              |  1 -
 recipes-containers/docker/docker-ce_git.bb   | 59 --------------------
 recipes-containers/docker/docker-moby_git.bb | 27 ++++-----
 recipes-containers/docker/docker.inc         |  8 ++-
 4 files changed, 17 insertions(+), 78 deletions(-)
 delete mode 100644 recipes-containers/docker/docker-ce_git.bb
conf/layer.conf +0 -1
index 88ac390..9a26bcc 100644
@@ -41,7 +41,6 @@ require conf/distro/include/virt_security_flags.inc
 
 PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
 PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
-PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"
 
 # Sanity check for meta-virtualization layer.
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
recipes-containers/docker/docker-ce_git.bb deleted +0 -59

59 lines not on this page · raw message

recipes-containers/docker/docker-moby_git.bb +12 -15
index cd6a741..94c72e7 100644
@@ -18,21 +18,18 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-# Notes:
-#   - This docker variant uses moby and the other individually maintained
-#     upstream variants for SRCREVs
-#   - It is a true community / upstream tracking build, and is not a
-#     docker curated set of commits or additions
-#   - The version number on this package tracks the versions assigned to
-#     the curated docker-ce repository. This allows compatibility and
-#     functional equivalence, while allowing new features to be more
-#     easily added.
-#   - This could be called "docker-moby" or just "moby" in the future, but
-#     that would require the creation of a virtual/docker dependency, which
-#     is possible, but overkill at the moment (while we wait for the upstream
-#     to stop changing).
-#   - The common components of this recipe and docker-ce do need to be moved
-#     to a docker.inc recipe
+#
+# https://github.com/docker/docker-ce-packaging.git
+#  common.mk:
+#    DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
+#    DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
+#    REF                ?= HEAD
+#    DOCKER_CLI_REF     ?= $(REF)
+#    DOCKER_ENGINE_REF  ?= $(REF)
+#
+# These follow the tags for our releases in the listed repositories
+# so we get that tag, and make it our SRCREVS:
+#
 
 SRCREV_moby = "219f21bf07502b447095649b5a2764661737f164"
 SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0"
recipes-containers/docker/docker.inc +5 -3
index 4a4bc4f..5cd8bdc 100644
@@ -31,15 +31,17 @@ RDEPENDS:${PN} += "virtual-containerd ${VIRTUAL-RUNTIME_container_runtime}"
 
 RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
 
-PROVIDES += "virtual/docker"
-
-# we want all the docker variant recpes to be installable via "docker"
+# make it installable via "docker"
 PACKAGE_NAME = "docker"
 RPROVIDES:${PN} += "docker"
 RPROVIDES:${PN}-dbg += "docker-dbg"
 RPROVIDES:${PN}-dev += "docker-dev"
 RPROVIDES:${PN}-contrip += "docker-dev"
 
+# For docker-ce backward compatibility
+PROVIDES += "docker-ce"
+RPROVIDES:${PN} += "docker-ce"
+
 inherit pkgconfig
 PACKAGECONFIG ??= "docker-init seccomp"
 PACKAGECONFIG[seccomp] = "seccomp,,libseccomp"
Signature · 1 line
2.40.0
#1 lore raw

PATCH 2/2 docker-moby: fix docker run on NFS

From: Chen Qi <[email protected]>

For now, a simple `docker run -it alpine' fails on NFS. This regression was introduced by a commit[1] which makes DirCopy error out if failing to copy xattr.

As the vfs storage driver is supposed to just work on any filesystem[2], we need to allow its failure on copying extended attributes as the support for xattr depends on filesystem.

[1] https://github.com/moby/moby/commit/31f654a704f61768828d5950a13f30bb493d1239
[2] https://docs.docker.com/storage/storagedriver/select-storage-driver/

---
 recipes-containers/docker/docker-moby_git.bb  |   1 +
 ...Allow-for-xattr-copy-failure-for-vfs.patch | 113 ++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 recipes-containers/docker/files/0001-Allow-for-xattr-copy-failure-for-vfs.patch
recipes-containers/docker/docker-moby_git.bb +1 -0
index 94c72e7..1bc758a 100644
@@ -43,6 +43,7 @@ SRC_URI = "\
 	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;patchdir=src/import \
+        file://0001-Allow-for-xattr-copy-failure-for-vfs.patch;patchdir=src/import \
 	"
 
 DOCKER_COMMIT = "${SRCREV_moby}"
recipes-containers/docker/files/0001-Allow-for-xattr-copy-failure-for-vfs.patch new file +113 -0

113 lines not on this page · raw message

Signature · 1 line
2.40.0
#2 lore raw
In reply to [email protected]
Quoted 9 lines · Chen Qi via lists.yoctoproject.org

From: Chen Qi <[email protected]>

Things have changed since these two recipe were added. Now
https://github.com/docker/docker has been redirected to
https://github.com/moby/moby. This means the contents of docker-ce_git.bb and docker-moby_git.bb are essentially the same except for some comments.

I'm going to keep them separate, I would have merged them together long ago otherwise.

There are use cases outside of this layer, that need the separate -ce tag and direction (+ patches) and not the moby tracking variant.

Bruce

Quoted 167 lines

So let's merge them into one and keep the merged recipe's name docker-moby, as the repo's name is moby.

The PROVIDES and RPROVIDES are added 'docker-ce' for backward compatibility.

---
 conf/layer.conf                              |  1 -
 recipes-containers/docker/docker-ce_git.bb   | 59 --------------------
 recipes-containers/docker/docker-moby_git.bb | 27 ++++-----
 recipes-containers/docker/docker.inc         |  8 ++-
 4 files changed, 17 insertions(+), 78 deletions(-)
 delete mode 100644 recipes-containers/docker/docker-ce_git.bb
conf/layer.conf +0 -1
index 88ac390..9a26bcc 100644
@@ -41,7 +41,6 @@ require conf/distro/include/virt_security_flags.inc
 
 PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
 PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
-PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"
 
 # Sanity check for meta-virtualization layer.
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
recipes-containers/docker/docker-ce_git.bb deleted +0 -59
deleted file mode 100644
index 6781c77..0000000
@@ -1,59 +0,0 @@
-HOMEPAGE = "http://www.docker.com"
-SUMMARY = "Linux container runtime"
-DESCRIPTION = "Linux container runtime \
- Docker complements kernel namespacing with a high-level API which \
- operates at the process level. It runs unix processes with strong \
- guarantees of isolation and repeatability across servers. \
- . \
- Docker is a great building block for automating distributed systems: \
- large-scale web deployments, database clusters, continuous deployment \
- systems, private PaaS, service-oriented architectures, etc. \
- . \
- This package contains the daemon and client, which are \
- officially supported on x86_64 and arm hosts. \
- Other architectures are considered experimental. \
- . \
- Also, note that kernel version 3.10 or above is required for proper \
- operation of the daemon process, and that any lower versions may have \
- subtle and/or glaring issues. \
- "
-
-#
-# https://github.com/docker/docker-ce-packaging.git
-#  common.mk:
-#    DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
-#    DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
-#    REF                ?= HEAD
-#    DOCKER_CLI_REF     ?= $(REF)
-#    DOCKER_ENGINE_REF  ?= $(REF)
-#
-# These follow the tags for our releases in the listed repositories
-# so we get that tag, and make it our SRCREVS:
-#
-
-SRCREV_docker = "219f21bf07502b447095649b5a2764661737f164"
-SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0"
-SRCREV_cli = "569dd73db13099a7c3104d73aa15117b359045bc"
-SRCREV_FORMAT = "docker_libnetwork"
-SRC_URI = "\
-       git://github.com/docker/docker.git;branch=23.0;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=23.0;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;patchdir=src/import \
-        file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \
-       "
-
-DOCKER_COMMIT = "${SRCREV_docker}"
-
-require docker.inc
-
-# Apache-2.0 for docker
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
-
-DOCKER_VERSION = "23.0.2-ce"
-PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
-
-CVE_PRODUCT = "docker mobyproject:moby"
recipes-containers/docker/docker-moby_git.bb +12 -15
index cd6a741..94c72e7 100644
@@ -18,21 +18,18 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-# Notes:
-#   - This docker variant uses moby and the other individually maintained
-#     upstream variants for SRCREVs
-#   - It is a true community / upstream tracking build, and is not a
-#     docker curated set of commits or additions
-#   - The version number on this package tracks the versions assigned to
-#     the curated docker-ce repository. This allows compatibility and
-#     functional equivalence, while allowing new features to be more
-#     easily added.
-#   - This could be called "docker-moby" or just "moby" in the future, but
-#     that would require the creation of a virtual/docker dependency, which
-#     is possible, but overkill at the moment (while we wait for the upstream
-#     to stop changing).
-#   - The common components of this recipe and docker-ce do need to be moved
-#     to a docker.inc recipe
+#
+# https://github.com/docker/docker-ce-packaging.git
+#  common.mk:
+#    DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
+#    DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
+#    REF                ?= HEAD
+#    DOCKER_CLI_REF     ?= $(REF)
+#    DOCKER_ENGINE_REF  ?= $(REF)
+#
+# These follow the tags for our releases in the listed repositories
+# so we get that tag, and make it our SRCREVS:
+#
 
 SRCREV_moby = "219f21bf07502b447095649b5a2764661737f164"
 SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0"
recipes-containers/docker/docker.inc +5 -4
index 4a4bc4f..5cd8bdc 100644
@@ -31,15 +31,17 @@ RDEPENDS:${PN} += "virtual-containerd ${VIRTUAL-RUNTIME_container_runtime}"
 
 RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
 
-PROVIDES += "virtual/docker"
-
-# we want all the docker variant recpes to be installable via "docker"
+# make it installable via "docker"
 PACKAGE_NAME = "docker"
 RPROVIDES:${PN} += "docker"
 RPROVIDES:${PN}-dbg += "docker-dbg"
 RPROVIDES:${PN}-dev += "docker-dev"
 RPROVIDES:${PN}-contrip += "docker-dev"
 
+# For docker-ce backward compatibility
+PROVIDES += "docker-ce"
+RPROVIDES:${PN} += "docker-ce"
+
 inherit pkgconfig
 PACKAGECONFIG ??= "docker-init seccomp"
 PACKAGECONFIG[seccomp] = "seccomp,,libseccomp"
--

2.40.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8014): https://lists.yoctoproject.org/g/meta-virtualization/message/8014
Mute This Topic: https://lists.yoctoproject.org/mt/98550499/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
author
#3 lore raw

Hi Bruce,

Sorry but I'm a little confused, as both recipes are now moby tracked.
I can recall that in the past the moby repo did not have all those tags and branches while the docker repo did. Now the docker repo (https://github.com/docker/docker) is no longer available, it's redirected to the moby repo (https://github.com/moby/moby). Plus the moby repo got all those tags and branches.

So does it mean that the only requirement from use cases outside meta-virt is the '-ce' tag? There's really no difference between these two recipes except for that.

Regards,
Qi

-----Original Message-----
From: Bruce Ashfield <[email protected]>
Sent: Friday, April 28, 2023 10:07 AM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [meta-virtualization][PATCH 1/2] docker-moby/docker-ce: merge into one

Quoted 9 lines · Chen Qi via lists.yoctoproject.org

From: Chen Qi <[email protected]>

Things have changed since these two recipe were added. Now
https://github.com/docker/docker has been redirected to
https://github.com/moby/moby. This means the contents of docker-ce_git.bb and docker-moby_git.bb are essentially the same except for some comments.

I'm going to keep them separate, I would have merged them together long ago otherwise.

There are use cases outside of this layer, that need the separate -ce tag and direction (+ patches) and not the moby tracking variant.

Bruce

Quoted 165 lines

So let's merge them into one and keep the merged recipe's name docker-moby, as the repo's name is moby.

The PROVIDES and RPROVIDES are added 'docker-ce' for backward compatibility.

---
 conf/layer.conf                              |  1 -
 recipes-containers/docker/docker-ce_git.bb   | 59 --------------------
 recipes-containers/docker/docker-moby_git.bb | 27 ++++-----
 recipes-containers/docker/docker.inc         |  8 ++-
 4 files changed, 17 insertions(+), 78 deletions(-)  delete mode 

100644 recipes-containers/docker/docker-ce_git.bb

conf/layer.conf index 88ac390..9a26bcc renamed from conf/layer.conf +0 -0

100644

conf/layer.conf +0 -1
@@ -41,7 +41,6 @@ require conf/distro/include/virt_security_flags.inc
 
 PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
 PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
-PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"
 
 # Sanity check for meta-virtualization layer.
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
recipes-containers/docker/docker-ce_git.bb deleted +0 -8
deleted file mode 100644
index 6781c77..0000000
@@ -1,59 +0,0 @@
-HOMEPAGE = "http://www.docker.com"
-SUMMARY = "Linux container runtime"
-DESCRIPTION = "Linux container runtime \
- Docker complements kernel namespacing with a high-level API which \
- operates at the process level. It runs unix processes with strong \
- guarantees of isolation and repeatability across servers. \
- . \
- Docker is a great building block for automating distributed systems: 

\
- large-scale web deployments, database clusters, continuous deployment \
- systems, private PaaS, service-oriented architectures, etc. \
- . \
- This package contains the daemon and client, which are \
- officially supported on x86_64 and arm hosts. \
- Other architectures are considered experimental. \
- . \
- Also, note that kernel version 3.10 or above is required for proper \
- operation of the daemon process, and that any lower versions may have \
- subtle and/or glaring issues. \
- "

recipes-containers/docker/docker-ce_git.bb deleted +0 -40
-
-#
-# https://github.com/docker/docker-ce-packaging.git
-#  common.mk:
-#    DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
-#    DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
-#    REF                ?= HEAD
-#    DOCKER_CLI_REF     ?= $(REF)
-#    DOCKER_ENGINE_REF  ?= $(REF)
-#
-# These follow the tags for our releases in the listed repositories 
-# so we get that tag, and make it our SRCREVS:
-#
-
-SRCREV_docker = "219f21bf07502b447095649b5a2764661737f164"
-SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0"
-SRCREV_cli = "569dd73db13099a7c3104d73aa15117b359045bc"
-SRCREV_FORMAT = "docker_libnetwork"
-SRC_URI = "\
-       git://github.com/docker/docker.git;branch=23.0;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=23.0;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;patchdir=src/import \
-        file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \
-       "
-
-DOCKER_COMMIT = "${SRCREV_docker}"
-
-require docker.inc
-
-# Apache-2.0 for docker
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
-
-DOCKER_VERSION = "23.0.2-ce"
-PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
-
-CVE_PRODUCT = "docker mobyproject:moby"
recipes-containers/docker/docker-moby_git.bb +12 -15
index cd6a741..94c72e7 100644
@@ -18,21 +18,18 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-# Notes:
-#   - This docker variant uses moby and the other individually maintained
-#     upstream variants for SRCREVs
-#   - It is a true community / upstream tracking build, and is not a
-#     docker curated set of commits or additions
-#   - The version number on this package tracks the versions assigned to
-#     the curated docker-ce repository. This allows compatibility and
-#     functional equivalence, while allowing new features to be more
-#     easily added.
-#   - This could be called "docker-moby" or just "moby" in the future, but
-#     that would require the creation of a virtual/docker dependency, which
-#     is possible, but overkill at the moment (while we wait for the upstream
-#     to stop changing).
-#   - The common components of this recipe and docker-ce do need to be moved
-#     to a docker.inc recipe
+#
+# https://github.com/docker/docker-ce-packaging.git
+#  common.mk:
+#    DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
+#    DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
+#    REF                ?= HEAD
+#    DOCKER_CLI_REF     ?= $(REF)
+#    DOCKER_ENGINE_REF  ?= $(REF)
+#
+# These follow the tags for our releases in the listed repositories # 
+so we get that tag, and make it our SRCREVS:
+#
 
 SRCREV_moby = "219f21bf07502b447095649b5a2764661737f164"
 SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0"
recipes-containers/docker/docker.inc +4 -4
index 4a4bc4f..5cd8bdc 100644
@@ -31,15 +31,17 @@ RDEPENDS:${PN} += "virtual-containerd ${VIRTUAL-RUNTIME_container_runtime}"
 
 RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
 
-PROVIDES += "virtual/docker"
-
-# we want all the docker variant recpes to be installable via "docker"
+# make it installable via "docker"
 PACKAGE_NAME = "docker"
 RPROVIDES:${PN} += "docker"
 RPROVIDES:${PN}-dbg += "docker-dbg"
 RPROVIDES:${PN}-dev += "docker-dev"
 RPROVIDES:${PN}-contrip += "docker-dev"
 
+# For docker-ce backward compatibility PROVIDES += "docker-ce"
+RPROVIDES:${PN} += "docker-ce"
+
 inherit pkgconfig
 PACKAGECONFIG ??= "docker-init seccomp"
 PACKAGECONFIG[seccomp] = "seccomp,,libseccomp"
--

2.40.0

Quoted 11 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#8014):
https://lists.yoctoproject.org/g/meta-virtualization/message/8014
Mute This Topic: https://lists.yoctoproject.org/mt/98550499/1050810
Group Owner: [email protected] Unsubscribe:
https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#4 lore raw
Quoted 8 lines · Qi

Hi Bruce,

Sorry but I'm a little confused, as both recipes are now moby tracked.
I can recall that in the past the moby repo did not have all those tags and branches while the docker repo did. Now the docker repo (https://github.com/docker/docker) is no longer available, it's redirected to the moby repo (https://github.com/moby/moby). Plus the moby repo got all those tags and branches.

So does it mean that the only requirement from use cases outside meta-virt is the '-ce' tag? There's really no difference between these two recipes except for that.

It means there are use cases outside of meta-virt that have changes based on whether something is docker vs moby, and that capability is done via the different recipes at the moment.

As I said, I would have merged them by now already, as clearly, I've been tracking and updating them for a lot of years now.

For the next release, I'm going to have some depreciation warnings for a few legacy recipes and namespaces, but I need to do those in coordination with other changes around the variables selecting the CRI/CNI, etc.

Bruce

Quoted 208 lines

Regards,
Qi

-----Original Message-----
From: Bruce Ashfield <[email protected]>
Sent: Friday, April 28, 2023 10:07 AM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [meta-virtualization][PATCH 1/2] docker-moby/docker-ce: merge into one

Quoted 9 lines · Chen Qi via lists.yoctoproject.org

From: Chen Qi <[email protected]>

Things have changed since these two recipe were added. Now
https://github.com/docker/docker has been redirected to
https://github.com/moby/moby. This means the contents of docker-ce_git.bb and docker-moby_git.bb are essentially the same except for some comments.

I'm going to keep them separate, I would have merged them together long ago otherwise.

There are use cases outside of this layer, that need the separate -ce tag and direction (+ patches) and not the moby tracking variant.

Bruce

Quoted 165 lines

So let's merge them into one and keep the merged recipe's name docker-moby, as the repo's name is moby.

The PROVIDES and RPROVIDES are added 'docker-ce' for backward compatibility.

---
 conf/layer.conf                              |  1 -
 recipes-containers/docker/docker-ce_git.bb   | 59 --------------------
 recipes-containers/docker/docker-moby_git.bb | 27 ++++-----
 recipes-containers/docker/docker.inc         |  8 ++-
 4 files changed, 17 insertions(+), 78 deletions(-)  delete mode

100644 recipes-containers/docker/docker-ce_git.bb

conf/layer.conf index 88ac390..9a26bcc renamed from conf/layer.conf +0 -0

100644

conf/layer.conf +0 -1
@@ -41,7 +41,6 @@ require conf/distro/include/virt_security_flags.inc
 
 PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
 PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
-PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"
 
 # Sanity check for meta-virtualization layer.
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
recipes-containers/docker/docker-ce_git.bb deleted +0 -8
deleted file mode 100644
index 6781c77..0000000
@@ -1,59 +0,0 @@
-HOMEPAGE = "http://www.docker.com"
-SUMMARY = "Linux container runtime"
-DESCRIPTION = "Linux container runtime \
- Docker complements kernel namespacing with a high-level API which \
- operates at the process level. It runs unix processes with strong \
- guarantees of isolation and repeatability across servers. \
- . \
- Docker is a great building block for automating distributed systems:

\
- large-scale web deployments, database clusters, continuous deployment \
- systems, private PaaS, service-oriented architectures, etc. \
- . \
- This package contains the daemon and client, which are \
- officially supported on x86_64 and arm hosts. \
- Other architectures are considered experimental. \
- . \
- Also, note that kernel version 3.10 or above is required for proper \
- operation of the daemon process, and that any lower versions may have \
- subtle and/or glaring issues. \
- "

recipes-containers/docker/docker-ce_git.bb deleted +0 -40
-
-#
-# https://github.com/docker/docker-ce-packaging.git
-#  common.mk:
-#    DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
-#    DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
-#    REF                ?= HEAD
-#    DOCKER_CLI_REF     ?= $(REF)
-#    DOCKER_ENGINE_REF  ?= $(REF)
-#
-# These follow the tags for our releases in the listed repositories
-# so we get that tag, and make it our SRCREVS:
-#
-
-SRCREV_docker = "219f21bf07502b447095649b5a2764661737f164"
-SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0"
-SRCREV_cli = "569dd73db13099a7c3104d73aa15117b359045bc"
-SRCREV_FORMAT = "docker_libnetwork"
-SRC_URI = "\
-       git://github.com/docker/docker.git;branch=23.0;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=23.0;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;patchdir=src/import \
-        file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \
-       "
-
-DOCKER_COMMIT = "${SRCREV_docker}"
-
-require docker.inc
-
-# Apache-2.0 for docker
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
-
-DOCKER_VERSION = "23.0.2-ce"
-PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
-
-CVE_PRODUCT = "docker mobyproject:moby"
recipes-containers/docker/docker-moby_git.bb +12 -15
index cd6a741..94c72e7 100644
@@ -18,21 +18,18 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-# Notes:
-#   - This docker variant uses moby and the other individually maintained
-#     upstream variants for SRCREVs
-#   - It is a true community / upstream tracking build, and is not a
-#     docker curated set of commits or additions
-#   - The version number on this package tracks the versions assigned to
-#     the curated docker-ce repository. This allows compatibility and
-#     functional equivalence, while allowing new features to be more
-#     easily added.
-#   - This could be called "docker-moby" or just "moby" in the future, but
-#     that would require the creation of a virtual/docker dependency, which
-#     is possible, but overkill at the moment (while we wait for the upstream
-#     to stop changing).
-#   - The common components of this recipe and docker-ce do need to be moved
-#     to a docker.inc recipe
+#
+# https://github.com/docker/docker-ce-packaging.git
+#  common.mk:
+#    DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
+#    DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
+#    REF                ?= HEAD
+#    DOCKER_CLI_REF     ?= $(REF)
+#    DOCKER_ENGINE_REF  ?= $(REF)
+#
+# These follow the tags for our releases in the listed repositories #
+so we get that tag, and make it our SRCREVS:
+#
 
 SRCREV_moby = "219f21bf07502b447095649b5a2764661737f164"
 SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0"
recipes-containers/docker/docker.inc +4 -4
index 4a4bc4f..5cd8bdc 100644
@@ -31,15 +31,17 @@ RDEPENDS:${PN} += "virtual-containerd ${VIRTUAL-RUNTIME_container_runtime}"
 
 RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
 
-PROVIDES += "virtual/docker"
-
-# we want all the docker variant recpes to be installable via "docker"
+# make it installable via "docker"
 PACKAGE_NAME = "docker"
 RPROVIDES:${PN} += "docker"
 RPROVIDES:${PN}-dbg += "docker-dbg"
 RPROVIDES:${PN}-dev += "docker-dev"
 RPROVIDES:${PN}-contrip += "docker-dev"
 
+# For docker-ce backward compatibility PROVIDES += "docker-ce"
+RPROVIDES:${PN} += "docker-ce"
+
 inherit pkgconfig
 PACKAGECONFIG ??= "docker-init seccomp"
 PACKAGECONFIG[seccomp] = "seccomp,,libseccomp"
--

2.40.0

Quoted 11 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#8014):
https://lists.yoctoproject.org/g/meta-virtualization/message/8014
Mute This Topic: https://lists.yoctoproject.org/mt/98550499/1050810
Group Owner: [email protected] Unsubscribe:
https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

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