From d1f9c58e4f8f8960d47e4e3e5f8f0ba3130d45a0 Mon Sep 17 00:00:00 2001 From: Branton Davis Date: Thu, 7 Oct 2021 22:13:02 -0500 Subject: [PATCH] Update to use new run script for Intel GPUs. --- docker-compose.nodeodm.gpu.intel.yml | 4 +++- webodm.sh | 11 +++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker-compose.nodeodm.gpu.intel.yml b/docker-compose.nodeodm.gpu.intel.yml index 97d781bb..f8e8f1d1 100644 --- a/docker-compose.nodeodm.gpu.intel.yml +++ b/docker-compose.nodeodm.gpu.intel.yml @@ -10,7 +10,9 @@ services: environment: - WO_DEFAULT_NODES node-odm: - image: opendronemap/nodeodm:gpu.intel.local + environment: + - RENDER_GROUP_ID + image: opendronemap/nodeodm:gpu.intel devices: - "/dev/dri" ports: diff --git a/webodm.sh b/webodm.sh index 14994b37..5aa77c05 100755 --- a/webodm.sh +++ b/webodm.sh @@ -54,17 +54,16 @@ detect_gpus(){ fi } -prepare_intel_gpu_image(){ +prepare_intel_render_group(){ if [ "${GPU_INTEL}" = true ]; then - curl -O https://raw.githubusercontent.com/OpenDroneMap/NodeODM/master/Dockerfile.gpu.intel.local - RENDER_GROUP_ID=$(getent group render | cut -d":" -f3) - docker build -f Dockerfile.gpu.intel.local -t opendronemap/nodeodm:gpu.intel.local --build-arg RENDER_GROUP_ID="${RENDER_GROUP_ID}" . - rm Dockerfile.gpu.intel + export RENDER_GROUP_ID=$(getent group render | cut -d":" -f3) + else + export RENDER_GROUP_ID=0 fi } detect_gpus -prepare_intel_gpu_image +prepare_intel_render_group case $key in --port)