docker: start depreciation of docker-ce

docker-ce and docker-moby are now exactly the same. To allow layers
which bbappend or otherwise consume docker-ce, we merge the two recipes
and leave a warning in docker-ce that it will be removed in the future.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 22 insertions, 63 deletions

diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index 6781c778..a3ea9ab5 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -1,59 +1,8 @@
-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"
+# docker-ce and docker-moby are now nearly identical. We simply include the
+# moby recipe and warn if this is being built.
+include docker-moby_git.bb
+
+do_compile:prepend() {
+    bbwarn "${PN} is now the same as docker-moby. This recipe will be removed in future releases."
+    bbwarn "Consumers of docker should migrate to moby as soon as possible"
+}
diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index cd6a7419..0738e2d4 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -27,12 +27,22 @@ DESCRIPTION = "Linux container runtime \
 #     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
+#
+# Packaging details:
+#
+# 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"