Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deduplicate between Volumes and Mounts in compat API #13540

Merged
merged 3 commits into from
Mar 18, 2022
Merged

Deduplicate between Volumes and Mounts in compat API #13540

merged 3 commits into from
Mar 18, 2022

Commits on Mar 17, 2022

  1. Deduplicate between Volumes and Mounts in compat API 

    Docker Compose v2.0 passes mount specifications in two different
places: Volumes (just the destination) and Mounts (full info
provided - source, destination, etc). This was causing Podman to
refuse to create containers, as the destination was used twice.
Deduplicate between Mounts and Volumes, preferring volumes, to
resolve this.

Fixes containers#11822

Signed-off-by: Matthew Heon <mheon@redhat.com>
    @mheon
    mheon committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    0793a58 View commit details
    Browse the repository at this point in the history

  2. Add tests with Docker Compose v2 

    Add a pair of new Cirrus test suites using Compose v2 instead of
Compose v1 (as is currently packaged in Fedora). They work
identically, and run the same tests, as the Compose v1 tests, but
with the new v2 binary instead.

[NO NEW TESTS NEEDED] This adds an entire Cirrus suite...

Signed-off-by: Matthew Heon <mheon@redhat.com>
    @mheon
    mheon committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    bde3ca8 View commit details
    Browse the repository at this point in the history

  3. Set names in compose tests based on version 

    Compose v2 uses dashes as separators instead of hyphens. This
broke some tests that relied upon container names. Set the name
conditionally to make it safe for both.

Signed-off-by: Matthew Heon <mheon@redhat.com>
    @mheon
    mheon committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    4b359e4 View commit details
    Browse the repository at this point in the history