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

e2e: ensure all Compose cmds standalone compatible #9567

Merged
merged 2 commits into from
Jun 16, 2022
Merged

e2e: ensure all Compose cmds standalone compatible #9567

merged 2 commits into from
Jun 16, 2022

Commits on Jun 16, 2022

  1. e2e: ensure all Compose cmds standalone compatible 

    The E2E tests can be run in plugin (`docker compose`) or standalone
(`docker-compose`) mode. Existing logic was in place to ensure that
the helper method is always used, which will invoke the right one
based on how tests are being executed.

However, this logic was too easy to (unintentionally) bypass given
the myriad of ways that commands can be run. The check has been
made stricter and pushed to a lower-level to more aggressively
catch instances.

As a result, a bunch of calls to `RunDockerCmd` are now updated
to be `RunDockerComposeCmd`, which will ensure that the invocation
is correct based on test mode.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
    @milas
    milas committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    9622395 View commit details
    Browse the repository at this point in the history

  2. e2e: use Compose for exec test 

    This was using `docker exec` on Compose containers instead of
`docker compose exec` (and `docker-compose exec` for standalone).

Thanks to @glours for catching!

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
    @milas
    milas committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    3248b7b View commit details
    Browse the repository at this point in the history