From e53a3579f6eb7fc730e6110b54888371f3fc6612 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 27 Oct 2026 15:14:08 +0000 Subject: [PATCH 1/3] Remove obsolete version attribute from compose files Compose v2 ignores the top-level version attribute and prints a warning for each file that still has one. Every file in the start sequence carried it, so every start began with two warnings. --- docker-compose.build.yml | 1 - docker-compose.dev.yml | 1 - docker-compose.ipv6.yml | 1 - docker-compose.nodemicmac.yml | 1 - docker-compose.nodeodm.gpu.nvidia.yml | 1 - docker-compose.nodeodm.volume.yml | 1 - docker-compose.nodeodm.yml | 1 - docker-compose.settings.yml | 1 - docker-compose.ssl-manual.yml | 1 - docker-compose.ssl.yml | 1 - docker-compose.worker-cpu.yml | 1 - docker-compose.worker-memory.yml | 1 - docker-compose.yml | 1 - 13 files changed, 13 deletions(-) diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 388594b5..17d07d34 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -1,6 +1,5 @@ # This configuration builds from Dockerfiles # instead of pulling from opendronemap hub -version: '2.1' services: # db: Commented out - use official postgis/postgis:14-3.3-alpine image from docker-compose.yml # db: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ae51686c..c5c5274c 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,4 +1,3 @@ -version: '2.1' services: webapp: entrypoint: /bin/bash -c "chmod +x /webui/*.sh && /bin/bash -c \"/webui/wait-for-postgres.sh db /webui/wait-for-it.sh -t 0 broker:6379 -- /webui/start.sh --create-default-pnode --setup-devenv\"" diff --git a/docker-compose.ipv6.yml b/docker-compose.ipv6.yml index b6fbbf34..ab81884e 100644 --- a/docker-compose.ipv6.yml +++ b/docker-compose.ipv6.yml @@ -1,4 +1,3 @@ -version: '2.2' networks: default: enable_ipv6: true diff --git a/docker-compose.nodemicmac.yml b/docker-compose.nodemicmac.yml index bc978a95..b4edea1a 100644 --- a/docker-compose.nodemicmac.yml +++ b/docker-compose.nodemicmac.yml @@ -2,7 +2,6 @@ # a default processing node instance. This is best for users # who are just getting started with OpenDroneMap WebUI. -version: '2.1' services: webapp: depends_on: diff --git a/docker-compose.nodeodm.gpu.nvidia.yml b/docker-compose.nodeodm.gpu.nvidia.yml index c35ac7be..dee6d023 100644 --- a/docker-compose.nodeodm.gpu.nvidia.yml +++ b/docker-compose.nodeodm.gpu.nvidia.yml @@ -2,7 +2,6 @@ # a default processing node instance. This is best for users # who are just getting started with OpenDroneMap WebUI. -version: '2.1' services: webapp: depends_on: diff --git a/docker-compose.nodeodm.volume.yml b/docker-compose.nodeodm.volume.yml index 6488f0da..8c91bb91 100644 --- a/docker-compose.nodeodm.volume.yml +++ b/docker-compose.nodeodm.volume.yml @@ -1,7 +1,6 @@ # Chaining this file to the main docker-compose file setups # volumes for NodeODM. -version: '2.1' services: node-odm-1: volumes: diff --git a/docker-compose.nodeodm.yml b/docker-compose.nodeodm.yml index 79224466..d30dd506 100644 --- a/docker-compose.nodeodm.yml +++ b/docker-compose.nodeodm.yml @@ -2,7 +2,6 @@ # a default processing node instance. This is best for users # who are just getting started with OpenDroneMap WebUI. -version: '2.1' services: webapp: depends_on: diff --git a/docker-compose.settings.yml b/docker-compose.settings.yml index 8cdb2494..bdada7dc 100644 --- a/docker-compose.settings.yml +++ b/docker-compose.settings.yml @@ -1,4 +1,3 @@ -version: '2.1' services: webapp: volumes: diff --git a/docker-compose.ssl-manual.yml b/docker-compose.ssl-manual.yml index 0c291e68..bb194522 100644 --- a/docker-compose.ssl-manual.yml +++ b/docker-compose.ssl-manual.yml @@ -1,5 +1,4 @@ # This configuration adds the volumes necessary for SSL manual setup -version: '2.1' services: webapp: volumes: diff --git a/docker-compose.ssl.yml b/docker-compose.ssl.yml index 5d511a18..13544c17 100644 --- a/docker-compose.ssl.yml +++ b/docker-compose.ssl.yml @@ -1,5 +1,4 @@ # This configuration adds support for SSL -version: '2.1' volumes: letsencrypt: driver: local diff --git a/docker-compose.worker-cpu.yml b/docker-compose.worker-cpu.yml index cfa7dc3c..28df0a83 100644 --- a/docker-compose.worker-cpu.yml +++ b/docker-compose.worker-cpu.yml @@ -1,4 +1,3 @@ -version: '2.2' services: worker: cpus: ${WO_WORKER_CPUS} diff --git a/docker-compose.worker-memory.yml b/docker-compose.worker-memory.yml index 4975362c..2785771b 100644 --- a/docker-compose.worker-memory.yml +++ b/docker-compose.worker-memory.yml @@ -1,4 +1,3 @@ -version: '2.1' services: worker: mem_limit: ${WO_WORKER_MEMORY} diff --git a/docker-compose.yml b/docker-compose.yml index 13b301d4..dd147545 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ # This configuration does not include a processing node # Which makes for faster setup times -version: '2.1' volumes: dbdata: appmedia: From 8b4c136e16449150e3fcf5854b8396f53e91498b Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 27 Oct 2026 15:14:08 +0000 Subject: [PATCH 2/3] Restore the published npm package name for the posm-gcpi plugin The rebrand renamed the dependency to opendronemap-posm-gcpi, but that package was never published. npm install failed with a 404 on every start and the plugin was left unregistered. webodm-posm-gcpi 1.0.0 is the package that exists on the registry. --- coreplugins/posm-gcpi/public/package.json | 2 +- coreplugins/posm-gcpi/templates/app.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreplugins/posm-gcpi/public/package.json b/coreplugins/posm-gcpi/public/package.json index d2bf6cf6..3ea9a7e8 100644 --- a/coreplugins/posm-gcpi/public/package.json +++ b/coreplugins/posm-gcpi/public/package.json @@ -9,6 +9,6 @@ "author": "", "license": "ISC", "dependencies": { - "opendronemap-posm-gcpi": "^1.0.0" + "webodm-posm-gcpi": "^1.0.0" } } diff --git a/coreplugins/posm-gcpi/templates/app.html b/coreplugins/posm-gcpi/templates/app.html index a4385a74..e2ee9a8e 100644 --- a/coreplugins/posm-gcpi/templates/app.html +++ b/coreplugins/posm-gcpi/templates/app.html @@ -1,5 +1,5 @@ {% extends "app/plugins/templates/base.html" %} {% block content %} - + {% endblock %} From d29894999f2dea32cf807ac7582436d2ee82b3c0 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 27 Oct 2026 15:14:08 +0000 Subject: [PATCH 3/3] Drop coreapi, openapi-codec and itypes Nothing imports them. Django REST framework removed coreapi support in 3.15, and the API docs they served are not wired into the URL tree. coreapi imports pkg_resources, which prints a deprecation warning on every process start under setuptools 81. Verified by uninstalling them in the image and running migrate, check and the URL import with UserWarning raised as an error. --- requirements.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7d64175c..cdbe3307 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,10 +34,7 @@ vine==5.1.0 APScheduler==3.10.4 # API and Documentation -coreapi==2.3.3 -openapi-codec==1.3.2 uritemplate==4.1.1 -itypes==1.2.0 # Geospatial Libraries # GDAL will be installed via pip with matching version from Alpine (3.9.x)