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.

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

⬆️ upgrading docker-compose to 2.x.x in dynamic-sidecar 🚨 #4545

Merged
merged 17 commits into from
Jul 26, 2023

Conversation

GitHK
Copy link
Contributor

@GitHK GitHK commented Jul 26, 2023

What do these changes do?

  • ♻️ docker-compose was replaced with docker compose inside the dynamic-sidecar
  • ♻️ compose-spec upgraded network format which was deprecated. external is no longer a dic.
  • ♻️ docker-compose python package is no longer a dependency of the dynamic-sidecar, it is now installed via apt.
  • ♻️ unpinned all constraints form the dynamic-sidecar's dependencies.

Bonus:

  • 🎯 pinned docker-ce-cli and docker-compose-plugin versions in the docker images of the autoscaling and dynamic-sidecar services.
  • ⬆️ upgraded PyYAML==6.0.1 in the dynamic-sidecar

Checks:

Related issue/s

How to test

DevOps Checklist

@codecov
Copy link

codecov bot commented Jul 26, 2023

Codecov Report

Merging #4545 (f61f71f) into master (e20bd93) will increase coverage by 4.2%.
The diff coverage is 79.5%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #4545      +/-   ##
=========================================
+ Coverage    85.7%   89.9%    +4.2%     
=========================================
  Files        1009      60     -949     
  Lines       43186    3183   -40003     
  Branches      997       0     -997     
=========================================
- Hits        37015    2862   -34153     
+ Misses       5942     321    -5621     
+ Partials      229       0     -229     
Flag Coverage Δ
integrationtests ?
unittests 89.9% <79.5%> (+5.7%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...simcore_service_dynamic_sidecar/core/validation.py 74.4% <50.0%> (-2.2%) ⬇️
...odules/attribute_monitor/_logging_event_handler.py 72.4% <80.0%> (ø)
...rvice_dynamic_sidecar/core/docker_compose_utils.py 94.9% <100.0%> (ø)
.../src/simcore_service_dynamic_sidecar/core/utils.py 86.7% <100.0%> (+0.1%) ⬆️
...e_dynamic_sidecar/modules/outputs/_event_filter.py 96.3% <100.0%> (ø)

... and 949 files with indirect coverage changes

@GitHK GitHK self-assigned this Jul 26, 2023
@GitHK GitHK added t:maintenance Some planned maintenance work changelog:♻️refactor labels Jul 26, 2023
@GitHK GitHK added this to the Sundae milestone Jul 26, 2023
@GitHK GitHK changed the title ⬆️ upgrading docker-compse to 2.x.x ⬆️ upgrading docker-compse to 2.x.x in dynamic-sidecar Jul 26, 2023
@GitHK GitHK marked this pull request as ready for review July 26, 2023 08:48
@GitHK GitHK requested review from sanderegg and pcrespov as code owners July 26, 2023 08:48
@GitHK GitHK requested a review from matusdrobuliak66 July 26, 2023 08:50
Copy link
Contributor

@matusdrobuliak66 matusdrobuliak66 left a comment

Choose a reason for hiding this comment

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

👍 please also add 🚨 to the name of the PR, so we know we should be careful. Thanks!

Copy link
Member

@pcrespov pcrespov left a comment

Choose a reason for hiding this comment

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

Well done! thx
If possible after this PR, could you please fully upgrade the service requirements in a separate PR . Yesterday I did not dare upgrading e.g. aiohttp to avoid creating confilcts with this PR. thx

@GitHK GitHK changed the title ⬆️ upgrading docker-compse to 2.x.x in dynamic-sidecar ⬆️ upgrading docker-compse to 2.x.x in dynamic-sidecar 🚨 Jul 26, 2023
Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

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

Thanks! please also check if cython really needs to be installed with @pcrespov. I think there is no need to install unneeded packages.

@GitHK GitHK enabled auto-merge (squash) July 26, 2023 10:12
@codeclimate
Copy link

codeclimate bot commented Jul 26, 2023

Code Climate has analyzed commit f61f71f and detected 0 issues on this pull request.

View more on Code Climate.

@GitHK GitHK merged commit b826a0a into ITISFoundation:master Jul 26, 2023
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.1% 0.1% Duplication

@GitHK GitHK deleted the pr-osparc-use-new-docker-compose branch July 26, 2023 10:26
@sanderegg sanderegg changed the title ⬆️ upgrading docker-compse to 2.x.x in dynamic-sidecar 🚨 ⬆️ upgrading docker-compose to 2.x.x in dynamic-sidecar 🚨 Aug 15, 2023
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Sep 22, 2023
50 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
t:maintenance Some planned maintenance work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

replace docker-compose 1.29.1 with docker cli and plugin
4 participants