diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-05-03 12:13:31 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-05-03 12:17:06 -0400 |
| commit | 3f692e3fe113b72852e0636fe58872830612c641 (patch) | |
| tree | a7e94dd1b0fd4f71eff356c52e98ba8b4ed2f0e9 /recipes-containers/docker/docker-moby_git.bb | |
| parent | 56494933803b4347a37ea5e264e9c088ef4a676e (diff) | |
| download | meta-virtualization-3f692e3fe113b72852e0636fe58872830612c641.tar.gz | |
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>
Diffstat (limited to 'recipes-containers/docker/docker-moby_git.bb')
| -rw-r--r-- | recipes-containers/docker/docker-moby_git.bb | 18 |
1 files changed, 14 insertions, 4 deletions
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 \ | |||
| 27 | # the curated docker-ce repository. This allows compatibility and | 27 | # the curated docker-ce repository. This allows compatibility and |
| 28 | # functional equivalence, while allowing new features to be more | 28 | # functional equivalence, while allowing new features to be more |
| 29 | # easily added. | 29 | # easily added. |
| 30 | # - This could be called "docker-moby" or just "moby" in the future, but | ||
| 31 | # that would require the creation of a virtual/docker dependency, which | ||
| 32 | # is possible, but overkill at the moment (while we wait for the upstream | ||
| 33 | # to stop changing). | ||
| 34 | # - The common components of this recipe and docker-ce do need to be moved | 30 | # - The common components of this recipe and docker-ce do need to be moved |
| 35 | # to a docker.inc recipe | 31 | # to a docker.inc recipe |
| 32 | # | ||
| 33 | # Packaging details: | ||
| 34 | # | ||
| 35 | # https://github.com/docker/docker-ce-packaging.git | ||
| 36 | # common.mk: | ||
| 37 | # DOCKER_CLI_REPO ?= https://github.com/docker/cli.git | ||
| 38 | # DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git | ||
| 39 | # REF ?= HEAD | ||
| 40 | # DOCKER_CLI_REF ?= $(REF) | ||
| 41 | # DOCKER_ENGINE_REF ?= $(REF) | ||
| 42 | # | ||
| 43 | # These follow the tags for our releases in the listed repositories | ||
| 44 | # so we get that tag, and make it our SRCREVS: | ||
| 45 | # | ||
| 36 | 46 | ||
| 37 | SRCREV_moby = "219f21bf07502b447095649b5a2764661737f164" | 47 | SRCREV_moby = "219f21bf07502b447095649b5a2764661737f164" |
| 38 | SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0" | 48 | SRCREV_libnetwork = "25ec449c45d2075c85fb3688ef4c1730be0466e0" |
