Skip to content

Refactor Docker Compose version detection to predictably pick v2 only if v1 is not available#16793

Merged
reta merged 1 commit intoopensearch-project:mainfrom
reta:refactor.docker.compose
Dec 6, 2024
Merged

Refactor Docker Compose version detection to predictably pick v2 only if v1 is not available#16793
reta merged 1 commit intoopensearch-project:mainfrom
reta:refactor.docker.compose

Conversation

@reta
Copy link
Copy Markdown
Contributor

@reta reta commented Dec 5, 2024

Description

Refactor Docker Compose version detection to predictably pick v2 only if v1 is not available. At the moment, if V1 and V2 are installed, the V1 is checked but ignored, with no option to be picked up.

Related Issues

Followup on #16049

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

… if v1 is not available

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Copy link
Copy Markdown
Member

@cwperks cwperks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 5, 2024

✅ Gradle check result for c3b5e30: SUCCESS

@codecov
Copy link
Copy Markdown

codecov bot commented Dec 5, 2024

Codecov Report

Attention: Patch coverage is 0% with 20 lines in your changes missing coverage. Please review.

Project coverage is 72.11%. Comparing base (42dc22e) to head (c3b5e30).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...opensearch/gradle/docker/DockerSupportService.java 0.00% 17 Missing ⚠️
...search/gradle/testfixtures/TestFixturesPlugin.java 0.00% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #16793      +/-   ##
============================================
+ Coverage     72.05%   72.11%   +0.06%     
- Complexity    65183    65206      +23     
============================================
  Files          5318     5318              
  Lines        303993   303996       +3     
  Branches      43990    43991       +1     
============================================
+ Hits         219028   219213     +185     
+ Misses        67046    66873     -173     
+ Partials      17919    17910       -9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta
Copy link
Copy Markdown
Contributor Author

reta commented Dec 5, 2024

Thanks a lot @cwperks, @andrross @dblock mind please taking a quick look? thanks!

@reta reta added the backport 2.x Backport to 2.x branch label Dec 5, 2024
@reta reta merged commit 98dbc4a into opensearch-project:main Dec 6, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 6, 2024
… if v1 is not available (#16793)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 98dbc4a)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit that referenced this pull request Dec 6, 2024
… if v1 is not available (#16793) (#16800)

(cherry picked from commit 98dbc4a)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Jan 21, 2025
… if v1 is not available (opensearch-project#16793)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport to 2.x branch skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants