tools/docker: backport some fixes from main/4.23 - #13814
Conversation
* tools: Build docker image from ubuntu 24.04 * docker: run UI with NODE_OPTIONS=--openssl-legacy-provider * docker: add MAVEN_OPTS
boring-cyborg
Bot
added
component:integration
component:marvin
docker
Python
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 4.22 #13814 +/- ##
============================================
+ Coverage 17.68% 17.82% +0.14%
- Complexity 15793 16221 +428
============================================
Files 5922 5926 +4
Lines 533123 543182 +10059
Branches 65201 68835 +3634
============================================
+ Hits 94268 96832 +2564
- Misses 428212 435540 +7328
- Partials 10643 10810 +167
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
the 4.22.1.0 docker image has been built by github action: https://github.com/apache/cloudstack/actions/runs/30618376380 |
|
There was a problem hiding this comment.
Pull request overview
Warning
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
Backports Docker/simulator build fixes by updating base OS and runtime dependencies, plus aligning tooling and CI workflow configuration.
Changes:
- Update Docker image base to Ubuntu 24.04 and move runtime to Java 17 / newer Node setup.
- Adjust Docker supervisor environment options for Maven and Node.
- Update Marvin Python dependency and refresh GitHub Actions runner/action pins.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
| tools/marvin/setup.py | Swap crypto dependency to pycryptodome. |
| tools/docker/supervisord.conf | Add MAVEN_OPTS and NODE_OPTIONS environment settings for supervised processes. |
| tools/docker/Dockerfile | Bump Ubuntu base, update Java packages, adjust Marvin install and NodeSource setup. |
| .github/workflows/docker-cloudstack-simulator.yml | Move workflow runner to ubuntu-24.04 and pin actions to SHAs / tweak checkout credentials. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| pip3 install $MARVIN_FILE --break-system-packages | ||
|
|
||
| RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -; \ | ||
| RUN curl -sL https://deb.nodesource.com/setup_24.x | sudo -E bash -; \ |
| RUN curl -sL https://deb.nodesource.com/setup_24.x | sudo -E bash -; \ | ||
| apt-get install -y nodejs; \ |
| openjdk-17-jre-headless \ | ||
| openjdk-17-jdk \ |
| MARVIN_FILE=`find /root/tools/marvin/dist/ -name "[mM]arvin*.tar.gz"`; \ | ||
| pip3 install $MARVIN_FILE --break-system-packages |
| "pytz", | ||
| "retries", | ||
| "PyCrypt", | ||
| "pycryptodome", |
Description
This PR fixes #13754
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?