Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: try to fix default hostname #1550

Closed
wants to merge 3 commits into from
Closed

feat: try to fix default hostname #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aafc96
feat: try to fix default hostname
NtskwK Sep 3, 2024
1a363fb
revert: recover tasks.py
NtskwK Sep 4, 2024
94ad7bf
feat: set container names for node-odm services
NtskwK Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose.nodeodm.gpu.intel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ services:
environment:
- RENDER_GROUP_ID
image: opendronemap/nodeodm:gpu.intel
container_name: node-odm-1
devices:
- "/dev/dri"
expose:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.nodeodm.gpu.nvidia.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
- WO_DEFAULT_NODES
node-odm:
image: opendronemap/nodeodm:gpu
container_name: node-odm-1
Copy link
Member

@pierotofy pierotofy Sep 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Did you test with:

./webodm.sh restart --default-nodes 3 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My apologies. I forgot there would be conflict here.

I still don't fully understand the way to the naming. Can you give me some advice?

Copy link
Member

Choose a reason for hiding this comment

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

You need to understand how docker-compose works.

This is a good start: https://docs.docker.com/compose/

Read it all.

expose:
- "3000"
restart: unless-stopped
Expand Down
1 change: 1 addition & 0 deletions docker-compose.nodeodm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
- WO_DEFAULT_NODES
node-odm:
image: opendronemap/nodeodm
container_name: node-odm-1
expose:
- "3000"
restart: unless-stopped
Expand Down
22 changes: 8 additions & 14 deletions webodm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,9 @@ start(){
down(){
command="$docker_compose -f docker-compose.yml"

if [ "${GPU_NVIDIA}" = true ]; then
command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
elif [ "${GPU_INTEL}" = true ]; then
command+=" -f docker-compose.nodeodm.gpu.intel.yml"
else
command+=" -f docker-compose.nodeodm.yml"
fi
command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
command+=" -f docker-compose.nodeodm.gpu.intel.yml"
command+=" -f docker-compose.nodeodm.yml"

command+=" -f docker-compose.nodemicmac.yml down --remove-orphans"

Expand Down Expand Up @@ -576,13 +572,11 @@ elif [[ $1 = "stop" ]]; then

command="$docker_compose -f docker-compose.yml"

if [ "${GPU_NVIDIA}" = true ]; then
command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
elif [ "${GPU_INTEL}" = true ]; then
command+=" -f docker-compose.nodeodm.gpu.intel.yml"
else
command+=" -f docker-compose.nodeodm.yml"
fi

command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
command+=" -f docker-compose.nodeodm.gpu.intel.yml"
command+=" -f docker-compose.nodeodm.yml"
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I understand the change here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The shutdown function now has to be entered after the --gpu to shut down the gpu node. But it's just the startup parameter in the manual. There may be users who get unexpected results. I would like to be able to make sure they shut down.



command+=" -f docker-compose.nodemicmac.yml stop"
run "${command}"
Expand Down
Loading