Fix docker-compose#1711
Merged
Merged
Conversation
Current v5.0.0 recipe availble in meta-virtualization is not working for vcs fetch-mode, required when patching individual modules (we have a local patch for cli), so update the recipe to the v5.1.0 release refreshing the go-mod*.inc files based on an older fetcher code from meta-virt. Updated with: bitbake -f -c discover_and_generate docker-compose python3 meta-virtualization/scripts/oe-go-mod-fetcher-hybrid.py \ --recipedir meta-virtualization/recipes-containers/docker-compose \ --git "github.com/containerd,github.com/docker/cli,k8s.io/api,k8s.io/kube-openapi,k8s.io/client-go" Upstream issue: https://lists.yoctoproject.org/g/meta-virtualization/message/9625 Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Refresh destdir folder based on latest changes from meta-virtualization to fetch using go-mods + git. Folder needs to be aligned with the cache hash used when fetching docker cli. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
ricardosalveti
force-pushed
the
main-next
branch
from
ef5cf75 to
4acaea7
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Docker-compose was changed to fetch dependencies via git and go-mods, and in order to be able to patch cli (lmp patch) the recipe requires cli to be fetched over git instead of go-mods.
Changing just the docker cli include is currently not possible due issues with latest meta-virtualization, as reported at https://lists.yoctoproject.org/g/meta-virtualization/message/9625, so use an older version of the same script and update docker-compose to the latest revision available, including the cli separation.
Once meta-virtualization is fixed upstream we should be able to have a reduced bbappend only.