Skip to content

Prep for release 3.6.2 - #273

Merged
smathermather merged 7 commits into
masterfrom
release-3.6.2
Sep 17, 2026
Merged

smathermather merged 7 commits into
masterfrom
release-3.6.2

Conversation

@MJohnson459

Copy link
Copy Markdown
Contributor

This PR mostly mirrors OpenDroneMap/ODM#2070 which updated the CI in ODM. The same changes are applied here.

  1. :edge will follow the master branch of NodeODM - eventually we probably want to have this track master of ODM but that has to happen after the 3.6.2 release due to the pixi switch. :edge-gpu and edge-gpu-intel are also created.
  2. :3.6.2, :3.6.2-gpu and 3.6.2-gpu-intel will be created on release, locked to the 3.6.2 releases of ODM.
  3. :latest, :gpu, and :gpu-intel will be created on each release, tracking the latest releases.

Note the CI on this PR won't run everything. The CI jobs roughly test a third on the PR, another third when merged into master, and the final release will test the last bits. I have manually run the dockerfiles etc manually, and it does match the ODM workflows as closely as I could so it should be safe.

Pin the CPU image to opendronemap/odm:3.6.2 and the GPU image to
opendronemap/odm:3.6.2-gpu. The floating :gpu tag no longer tracks the
newest release, so the GPU build pins the versioned tag instead.
Both Docker workflows now delegate to docker/github-builder's reusable
build workflow, as ODM's do: each platform builds on its own native
runner (arm64 no longer runs under QEMU), the image carries OCI labels
from docker/metadata-action, and pull requests build without pushing.
The Dockerfile's --powercycle run is the smoke test, so the separate
Build PRs workflow goes.

Master pushes write only :edge, :edge-gpu and :edge-gpu-intel. A v* tag
writes :<version>, :<version>-gpu, :<version>-gpu-intel plus the
:latest, :gpu and :gpu-intel aliases, so the stable tags stop moving on
every master build. The Intel image's tag changes spelling from :gpu.intel
to :gpu-intel; the old name is not carried forward. Prerelease tags
(v3.7.0-rc1) get versioned tags only.

The Intel image is a second job in the GPU workflow and builds from the
GPU image's digest instead of racing the :gpu tag from a separate
workflow. Dockerfile.gpu.intel takes FROM_REPO as a build arg for that.
checkout and setup-node move to their current majors, and the bundle
artifact is kept for three days instead of the 90-day default. The
release asset on a v* tag is unaffected.
NodeODM's version now tracks the ODM release it wraps. The git tag drives
the Docker tags and the Windows bundle release, so one number names the
engine, the image and the bundle.
The base image has been on CUDA 12 since ODM 3.6.0 and ships no
/usr/local/cuda-11.2/compat, so the entry only left a dangling path in
/etc/ld.so.conf.d. Reported in #271.
The build ran --powercycle as root before switching to the odm user, so
it never proved that odm can start the server. Moving the check after
USER odm makes the image build fail if the runtime user cannot.
Comment thread Dockerfile Resolved
Comment thread Dockerfile.gpu Resolved

@smathermather smathermather left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Small changes indicated below. Should put either your name / email or mine,, or alternatively OpenDroneMap Developers, maintainers@opendronemap.org

@MJohnson459

Copy link
Copy Markdown
Contributor Author

Good point. I updated to the maintainers@opendronemap.org email. I also switched to the newer format while I was there which removes a deprecation warning.

@smathermather
smathermather self-requested a review September 17, 2026 13:04
@smathermather
smathermather merged commit d45bc41 into master Sep 17, 2026
10 checks passed
@MJohnson459
MJohnson459 deleted the release-3.6.2 branch September 24, 2026 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Docker Hub publishing has been failing since March — nodeodm:gpu frozen at 2025-10-22, GPU SIFT silently broken

2 participants