kopia lustrzana https://github.com/OpenDroneMap/WebODM
Remove building of intel image during install and build extension during startup.
rodzic
6530cd7d1a
commit
e9fc57dc17
|
@ -10,7 +10,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- WO_DEFAULT_NODES
|
- WO_DEFAULT_NODES
|
||||||
node-odm:
|
node-odm:
|
||||||
image: opendronemap/nodeodm:gpu.intel
|
image: opendronemap/nodeodm:gpu.intel.local
|
||||||
devices:
|
devices:
|
||||||
- "/dev/dri"
|
- "/dev/dri"
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -11,12 +11,10 @@ WEBODM_DPKG_NAME="webodm_${WEBODM_VERSION}-${WEBODM_DPKG_VERSION}"
|
||||||
BUILD_DIR="${HERE}/build"
|
BUILD_DIR="${HERE}/build"
|
||||||
DEB_DIR="${HERE}/deb"
|
DEB_DIR="${HERE}/deb"
|
||||||
WEBODM_DIR="${HERE}/${WEBODM_DPKG_NAME}/opt/WebODM"
|
WEBODM_DIR="${HERE}/${WEBODM_DPKG_NAME}/opt/WebODM"
|
||||||
NODEODM_DIR="${HERE}/${WEBODM_DPKG_NAME}/opt/NodeODM"
|
|
||||||
|
|
||||||
function build() {
|
function build() {
|
||||||
prepareBuildDir
|
prepareBuildDir
|
||||||
prepareDebDir
|
prepareDebDir
|
||||||
prepareNodeODMDir
|
|
||||||
prepareWebODMDir
|
prepareWebODMDir
|
||||||
moveToBuildDir
|
moveToBuildDir
|
||||||
buildDeb
|
buildDeb
|
||||||
|
@ -55,11 +53,6 @@ function prepareDebDir() {
|
||||||
mkdir -p "${DEB_DIR}"
|
mkdir -p "${DEB_DIR}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareNodeODMDir() {
|
|
||||||
# This can go away when we can pull the image from Docker Hub.
|
|
||||||
git clone https://github.com/OpenDroneMap/NodeODM.git "${BUILD_DIR}/${WEBODM_DPKG_NAME}/${WEBODM_DPKG_NAME}/opt/NodeODM"
|
|
||||||
}
|
|
||||||
|
|
||||||
function prepareWebODMDir() {
|
function prepareWebODMDir() {
|
||||||
TMP_DIR="/tmp/WebODM"
|
TMP_DIR="/tmp/WebODM"
|
||||||
if [ -d "${BUILD_DIR}" ]; then
|
if [ -d "${BUILD_DIR}" ]; then
|
||||||
|
|
|
@ -7,46 +7,15 @@ export WEBODM_USER=odm
|
||||||
export WEBODM_USER_HOME="/home/${WEBODM_USER}"
|
export WEBODM_USER_HOME="/home/${WEBODM_USER}"
|
||||||
export WEBODM_DIR=/opt/WebODM
|
export WEBODM_DIR=/opt/WebODM
|
||||||
export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
|
export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
|
||||||
export NODEODM_DIR=/opt/NodeODM
|
|
||||||
|
|
||||||
function abortRemove() {
|
function abortRemove() {
|
||||||
echo "Unable to remove webodm."
|
echo "Unable to remove webodm."
|
||||||
}
|
}
|
||||||
|
|
||||||
function addNodeODMGPUIntelDockerGroups() {
|
|
||||||
DOCKER_COMPOSE_FILE="${WEBODM_DIR}/docker-compose.nodeodm.gpu.intel.yml"
|
|
||||||
for gid in $(id -G "${WEBODM_USER}"); do
|
|
||||||
SED_SEARCH="/^\s\{4\}group_add/{:start /${gid}$/!"
|
|
||||||
SED_SEARCH="${SED_SEARCH}{N;b start};/${gid}$/p}"
|
|
||||||
SED_OUT=$(sed -n "${SED_SEARCH}" "${DOCKER_COMPOSE_FILE}")
|
|
||||||
if [ -z "${SED_OUT}" ]; then
|
|
||||||
sed -i "/^\s\{4\}image/a \ \ \ \ group_add:\n\ \ \ \ \ \ - ${gid}" "${DOCKER_COMPOSE_FILE}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildNodeODMGPUIntelDockerImage() {
|
|
||||||
cd "${NODEODM_DIR}"
|
|
||||||
|
|
||||||
# We won't have to do this after the image is on Docker Hub.
|
|
||||||
docker build -f Dockerfile.gpu -t opendronemap/nodeodm:gpu .
|
|
||||||
|
|
||||||
# This will continue to be necessary, since it needs to bake in the actual
|
|
||||||
# render group id on this system.
|
|
||||||
RENDER_GROUP_ID=$(getent group render | cut -d":" -f3)
|
|
||||||
docker build -f Dockerfile.gpu.intel -t opendronemap/nodeodm:gpu.intel --build-arg RENDER_GROUP_ID="${RENDER_GROUP_ID}" .
|
|
||||||
}
|
|
||||||
|
|
||||||
function configure() {
|
function configure() {
|
||||||
detectGPUs
|
detectGPUs
|
||||||
createGroup
|
createGroup
|
||||||
createUser
|
createUser
|
||||||
|
|
||||||
if [ "${GPU_INTEL}" = true ]; then
|
|
||||||
buildNodeODMGPUIntelDockerImage
|
|
||||||
addNodeODMGPUIntelDockerGroups
|
|
||||||
fi
|
|
||||||
|
|
||||||
createVenv
|
createVenv
|
||||||
setFilePermissions
|
setFilePermissions
|
||||||
upgradePythonPip
|
upgradePythonPip
|
||||||
|
|
|
@ -7,7 +7,6 @@ export WEBODM_USER=odm
|
||||||
export WEBODM_USER_HOME="/home/${WEBODM_USER}"
|
export WEBODM_USER_HOME="/home/${WEBODM_USER}"
|
||||||
export WEBODM_DIR=/opt/WebODM
|
export WEBODM_DIR=/opt/WebODM
|
||||||
export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
|
export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
|
||||||
export NODEODM_DIR=/opt/NodeODM
|
|
||||||
|
|
||||||
function abortInstall() {
|
function abortInstall() {
|
||||||
purge
|
purge
|
||||||
|
|
|
@ -7,7 +7,6 @@ export WEBODM_USER=odm
|
||||||
export WEBODM_USER_HOME="/home/${WEBODM_USER}"
|
export WEBODM_USER_HOME="/home/${WEBODM_USER}"
|
||||||
export WEBODM_DIR=/opt/WebODM
|
export WEBODM_DIR=/opt/WebODM
|
||||||
export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
|
export WEBODM_VENV_DIR="${WEBODM_DIR}/python3-venv"
|
||||||
export NODEODM_DIR=/opt/NodeODM
|
|
||||||
|
|
||||||
function remove() {
|
function remove() {
|
||||||
stopService
|
stopService
|
||||||
|
|
44
webodm.sh
44
webodm.sh
|
@ -43,6 +43,30 @@ while [[ $# -gt 0 ]]
|
||||||
do
|
do
|
||||||
key="$1"
|
key="$1"
|
||||||
|
|
||||||
|
detect_gpus(){
|
||||||
|
export GPU_AMD=false
|
||||||
|
export GPU_INTEL=false
|
||||||
|
export GPU_NVIDIA=false
|
||||||
|
|
||||||
|
if [ "${platform}" = "Linux" ]; then
|
||||||
|
source "${__dirname}/detect_gpus.sh"
|
||||||
|
set +ux
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
prepare_intel_gpu_image(){
|
||||||
|
if [ "${GPU_INTEL}" = true ]; then
|
||||||
|
# curl -O https://raw.githubusercontent.com/OpenDroneMap/NodeODM/master/Dockerfile.gpu.intel
|
||||||
|
curl -O https://raw.githubusercontent.com/airmap/NodeODM/bkd/gpu-intel-workflow/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
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
detect_gpus
|
||||||
|
prepare_intel_gpu_image
|
||||||
|
|
||||||
case $key in
|
case $key in
|
||||||
--port)
|
--port)
|
||||||
export WO_PORT="$2"
|
export WO_PORT="$2"
|
||||||
|
@ -220,11 +244,6 @@ start(){
|
||||||
command="docker-compose -f docker-compose.yml"
|
command="docker-compose -f docker-compose.yml"
|
||||||
|
|
||||||
if [[ $default_nodes > 0 ]]; then
|
if [[ $default_nodes > 0 ]]; then
|
||||||
if [ "${platform}" = "Linux" ]; then
|
|
||||||
source "${__dirname}/detect_gpus.sh"
|
|
||||||
set +ux
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${GPU_NVIDIA}" = true ]; then
|
if [ "${GPU_NVIDIA}" = true ]; then
|
||||||
command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
|
command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
|
||||||
elif [ "${GPU_INTEL}" = true ]; then
|
elif [ "${GPU_INTEL}" = true ]; then
|
||||||
|
@ -294,11 +313,6 @@ start(){
|
||||||
}
|
}
|
||||||
|
|
||||||
down(){
|
down(){
|
||||||
if [ "${platform}" = "Linux" ]; then
|
|
||||||
source "${__dirname}/detect_gpus.sh"
|
|
||||||
set +ux
|
|
||||||
fi
|
|
||||||
|
|
||||||
command="docker-compose -f docker-compose.yml"
|
command="docker-compose -f docker-compose.yml"
|
||||||
|
|
||||||
if [ "${GPU_NVIDIA}" = true ]; then
|
if [ "${GPU_NVIDIA}" = true ]; then
|
||||||
|
@ -369,11 +383,6 @@ elif [[ $1 = "stop" ]]; then
|
||||||
environment_check
|
environment_check
|
||||||
echo "Stopping WebODM..."
|
echo "Stopping WebODM..."
|
||||||
|
|
||||||
if [ "${platform}" = "Linux" ]; then
|
|
||||||
source "${__dirname}/detect_gpus.sh"
|
|
||||||
set +ux
|
|
||||||
fi
|
|
||||||
|
|
||||||
command="docker-compose -f docker-compose.yml"
|
command="docker-compose -f docker-compose.yml"
|
||||||
|
|
||||||
if [ "${GPU_NVIDIA}" = true ]; then
|
if [ "${GPU_NVIDIA}" = true ]; then
|
||||||
|
@ -417,11 +426,6 @@ elif [[ $1 = "update" ]]; then
|
||||||
command="docker-compose -f docker-compose.yml"
|
command="docker-compose -f docker-compose.yml"
|
||||||
|
|
||||||
if [[ $default_nodes > 0 ]]; then
|
if [[ $default_nodes > 0 ]]; then
|
||||||
if [ "${platform}" = "Linux" ]; then
|
|
||||||
source "${__dirname}/detect_gpus.sh"
|
|
||||||
set +ux
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${GPU_NVIDIA}" = true ]; then
|
if [ "${GPU_NVIDIA}" = true ]; then
|
||||||
command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
|
command+=" -f docker-compose.nodeodm.gpu.nvidia.yml"
|
||||||
elif [ "${GPU_INTEL}" = true ]; then
|
elif [ "${GPU_INTEL}" = true ]; then
|
||||||
|
|
Ładowanie…
Reference in New Issue