Skip to content

Conversation

@cbentejac
Copy link
Contributor

@cbentejac cbentejac commented Dec 23, 2024

Description

This PR updates the Dockerfiles for Meshroom as follows:

  • The Dockerfiles for CentOS 7 are replaced with Dockerfiles for Rocky 9
  • The version of Ubuntu and CUDA is upgraded for the Ubuntu Dockerfiles (from 20.04 to 22.04)
  • The installation of Qt is updated to correctly use the installer for Qt 6

Features list

  • Remove CentOS 7 Dockerfiles and scripts
  • Update Ubuntu Dockerfiles
  • Add new Dockerfiles and scripts for Rocky 9

@codecov
Copy link

codecov bot commented Dec 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.80%. Comparing base (aeadee5) to head (650d4d1).
Report is 49 commits behind head on develop.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2626      +/-   ##
===========================================
- Coverage    78.57%   77.80%   -0.77%     
===========================================
  Files           48       48              
  Lines         6577     6674      +97     
===========================================
+ Hits          5168     5193      +25     
- Misses        1409     1481      +72     

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

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@cbentejac cbentejac marked this pull request as ready for review January 20, 2025 13:47
@sebastienmascha
Copy link

Thank you for this great PR.

I am new to Meshroom, I would like to know more about the Docker infrastructure design and eventually contribute to the project as well.

For AliceVision and Meshroom, why are we using a dl folder and use wget --no-check-certificate "https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run in the build-*.sh scripts?

Why not directly include those calls in the Dockerfile? It would improve the isolation and avoid unnecessary Build Context.

I am happy to create a PR if needed.

@sebastienmascha
Copy link

sebastienmascha commented Jan 22, 2025

Why not add the environment variables inside the docker as well?

export ALICEVISION_ROOT=/opt/AliceVision_install
export ALICEVISION_SENSOR_DB=/opt/AliceVision_install/share/aliceVision/cameraSensors.db
export ALICEVISION_VOCTREE=/opt/AliceVision_install/share/aliceVision/vlfeat_K80L3.SIFT.tree
export ALICEVISION_SPHERE_DETECTION_MODEL=/opt/AliceVision_install/share/aliceVision/sphereDetection_Mask-RCNN.onnx
export ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=/opt/AliceVision_install/share/aliceVision/fcn_resnet50.onnx
export PATH=$PATH:/opt/AliceVision_install/bin
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/AliceVision_install/lib

@hiaselhans
Copy link

@cbentejac since alicevision uses the 22.04 image now and these changes seem due, do you think these will be merged in the near future?

@hiaselhans
Copy link

@cbentejac do you think this PR will make it in the develop branch anytime soon?

@hiaselhans
Copy link

@cbentejac @nicolas-lambert-tc

I don't know how you build, but Alicevision already uses these Images, so i think it Meshroom should follow like it is intended in this PR.
Is there any blocker i could help to address so it can be merged?

@cbentejac
Copy link
Contributor Author

Hi @hiaselhans,

Yes, this PR will be merged soon! I need to slightly rework it before we do, though. I'm converting it to "draft" until then.

@cbentejac cbentejac marked this pull request as draft June 4, 2025 14:56
@cbentejac cbentejac force-pushed the build/rockyDocker branch 2 times, most recently from 3c667cb to 7921503 Compare June 24, 2025 13:18
@cbentejac cbentejac force-pushed the build/rockyDocker branch from 7921503 to 71597c4 Compare June 24, 2025 13:20
The installation of plugins will be handled separately, and not directly
in Meshroom's images.
@cbentejac cbentejac marked this pull request as ready for review June 25, 2025 09:15
@fabiencastan fabiencastan merged commit 517a64d into develop Jun 25, 2025
4 of 5 checks passed
@fabiencastan fabiencastan deleted the build/rockyDocker branch June 25, 2025 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants