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

Add support for compose v2 with ComposeContainer #5608

Merged
merged 48 commits into from
Jun 21, 2023
Merged

Add support for compose v2 with ComposeContainer #5608

merged 48 commits into from
Jun 21, 2023

Commits on Jul 24, 2022

  1. Add support for compose v2 

    [Compose V2](https://www.docker.com/blog/announcing-compose-v2-general-availability/)
offers arm images to perform `docker compose` commands. It should be
enabled

```java
public static DockerComposeContainer environment =
    new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
            .withComposeV2()
            .withExposedService("redis-1", REDIS_PORT, Wait.forListeningPort())
            .waitingFor("db-1", Wait.forLogMessage("started", 1));
```
    @eddumelendez
    eddumelendez committed Jul 24, 2022
    Configuration menu
    Copy the full SHA
    8573b7e View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. Add configuration property to enable compose v2 compatibility

    @eddumelendez
    eddumelendez committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    9f3983b View commit details
    Browse the repository at this point in the history

  2. Add docs

    @eddumelendez
    eddumelendez committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    2f4c569 View commit details
    Browse the repository at this point in the history

  3. Fix tests

    @eddumelendez
    eddumelendez committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    cb139d5 View commit details
    Browse the repository at this point in the history

  4. Fix assumption

    @eddumelendez
    eddumelendez committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    69dbf78 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Update docs/modules/docker_compose.md 

    Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
    @eddumelendez @kiview
    eddumelendez and kiview authored Jul 29, 2022
    Configuration menu
    Copy the full SHA
    7f9e995 View commit details
    Browse the repository at this point in the history

  2. Autodetect compose v2

    @eddumelendez
    eddumelendez committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    48b15a9 View commit details
    Browse the repository at this point in the history

  3. Add testcontainers prefix to config property

    @eddumelendez
    eddumelendez committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    2cdfb5c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into composev2

    @eddumelendez
    eddumelendez committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    deb5f2b View commit details
    Browse the repository at this point in the history

  5. Fix test

    @eddumelendez
    eddumelendez committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    afbc537 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. Fix test

    @eddumelendez
    eddumelendez committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    01f28f8 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Fix comments

    @eddumelendez
    eddumelendez committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    e8e07c5 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2022

  1. Set composev2 enabled by default and add compatibility mode

    @eddumelendez
    eddumelendez committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    6b670d4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into composev2

    @eddumelendez
    eddumelendez committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    c8b49b4 View commit details
    Browse the repository at this point in the history

  3. Fix test

    @eddumelendez
    eddumelendez committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    1fd85c5 View commit details
    Browse the repository at this point in the history

  4. Update missing test

    @eddumelendez
    eddumelendez committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    d65db21 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. Add ComposeContainer

    @eddumelendez
    eddumelendez committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    1b4c884 View commit details
    Browse the repository at this point in the history

  2. Remove test

    @eddumelendez
    eddumelendez committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    f7d875f View commit details
    Browse the repository at this point in the history

  3. Remove configuration doc

    @eddumelendez
    eddumelendez committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    f1436d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Merge branch 'master' into composev2

    @eddumelendez
    eddumelendez committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    e67ebc6 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. Changes

    @eddumelendez
    eddumelendez committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    a252f29 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. Refactor DockerComposeContainer

    @eddumelendez
    eddumelendez committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    b6c9ddd View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Merge branch 'master' into composev2

    @eddumelendez
    eddumelendez committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    3d2c056 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. Merge branch 'main' into composev2

    @eddumelendez
    eddumelendez committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    153b9ef View commit details
    Browse the repository at this point in the history

  2. Rename and introduce ComposeVersion enum

    @eddumelendez
    eddumelendez committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    8e37af6 View commit details
    Browse the repository at this point in the history

  3. Update docs/modules/docker_compose.md 

    Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
    @eddumelendez @kiview
    eddumelendez and kiview authored Sep 30, 2022
    Configuration menu
    Copy the full SHA
    2d07a92 View commit details
    Browse the repository at this point in the history

  4. Updates

    @eddumelendez
    eddumelendez committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    dc785f1 View commit details
    Browse the repository at this point in the history

  5. Update ComposeContainer

    @eddumelendez
    eddumelendez committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    40e08db View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Fix compose v2 start commmand

    @eddumelendez
    eddumelendez committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    9619dee View commit details
    Browse the repository at this point in the history

  2. Add options in specific position for compose v2

    @eddumelendez
    eddumelendez committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    b6f0829 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into composev2

    @eddumelendez
    eddumelendez committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    04e04cb View commit details
    Browse the repository at this point in the history

  4. Fix test

    @eddumelendez
    eddumelendez committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    10919cc View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Merge branch 'main' into composev2

    @eddumelendez
    eddumelendez committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    2214f8a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Copy compose file to work with remote docker

    @eddumelendez
    eddumelendez committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    ca78119 View commit details
    Browse the repository at this point in the history

  2. Update docker images to run in arm

    @eddumelendez
    eddumelendez committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    7bbf135 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Use different redis versions

    @eddumelendez
    eddumelendez committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    c829746 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. Merge branch 'main' into composev2

    @eddumelendez
    eddumelendez committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    196d180 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Drop link in favor of networks

    @eddumelendez
    eddumelendez committed May 2, 2023
    Configuration menu
    Copy the full SHA
    337e0c7 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Merge branch 'main' into composev2

    @eddumelendez
    eddumelendez committed May 10, 2023
    Configuration menu
    Copy the full SHA
    601148e View commit details
    Browse the repository at this point in the history

  2. Add test for identifier in uppercase

    @eddumelendez
    eddumelendez committed May 10, 2023
    Configuration menu
    Copy the full SHA
    0840644 View commit details
    Browse the repository at this point in the history

  3. Revert "Drop link in favor of networks" 

    This reverts commit 337e0c7.
    @eddumelendez
    eddumelendez committed May 10, 2023
    Configuration menu
    Copy the full SHA
    6a39b89 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Merge branch 'main' into composev2

    @eddumelendez
    eddumelendez committed May 16, 2023
    Configuration menu
    Copy the full SHA
    c2dcc88 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Fix test

    @eddumelendez
    eddumelendez committed May 17, 2023
    Configuration menu
    Copy the full SHA
    39b37d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Update core/src/main/java/org/testcontainers/containers/ComposeContai… 

    …ner.java

Co-authored-by: Kevin Wittek <kiview@users.noreply.github.com>
    @eddumelendez @kiview
    eddumelendez and kiview authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    a078382 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into composev2

    @eddumelendez
    eddumelendez committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    4c7ca00 View commit details
    Browse the repository at this point in the history

  3. Add note

    @eddumelendez
    eddumelendez committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9317f81 View commit details
    Browse the repository at this point in the history

  4. Update docker version

    @eddumelendez
    eddumelendez committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    3e21972 View commit details
    Browse the repository at this point in the history

  5. Update labeler.yml

    @eddumelendez
    eddumelendez committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7e2f2da View commit details
    Browse the repository at this point in the history