kopia lustrzana https://github.com/OpenDroneMap/ODM
Dockerfile fixes
rodzic
6037a5d356
commit
fb04f7c0fa
12
Dockerfile
12
Dockerfile
|
@ -55,7 +55,8 @@ RUN apt-get install --no-install-recommends -y \
|
|||
python-pyproj \
|
||||
python-software-properties \
|
||||
python-wheel \
|
||||
swig2.0
|
||||
swig2.0 \
|
||||
grass-core
|
||||
|
||||
RUN apt-get remove libdc1394-22-dev
|
||||
RUN pip install --upgrade pip
|
||||
|
@ -110,15 +111,6 @@ RUN cd SuperBuild \
|
|||
&& cmake .. \
|
||||
&& make -j$(nproc)
|
||||
|
||||
RUN apt-get -y remove \
|
||||
git \
|
||||
build-essential \
|
||||
cmake \
|
||||
libgl1-mesa-dri \
|
||||
python-pip
|
||||
|
||||
RUN apt-get install -y libvtk6-dev grass-core
|
||||
|
||||
# Cleanup APT
|
||||
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ class LocalRemoteExecutor:
|
|||
if isinstance(error, NodeTaskLimitReachedException) and not nonloc.semaphore and node_task_limit.value > 0:
|
||||
sem_value = max(1, node_task_limit.value - 1)
|
||||
nonloc.semaphore = threading.Semaphore(sem_value)
|
||||
log.ODM_DEBUG("LRE: Node task limit reached. Setting semaphore to %s" % node_task_limit.value)
|
||||
log.ODM_DEBUG("LRE: Node task limit reached. Setting semaphore to %s" % sem_value)
|
||||
for i in range(sem_value):
|
||||
nonloc.semaphore.acquire()
|
||||
release_semaphore = False
|
||||
|
@ -353,10 +353,10 @@ class Task:
|
|||
except exceptions.TaskFailedError as e:
|
||||
# Try to get output
|
||||
try:
|
||||
msg = "LRE: %s failed with task output: %s" % (self, "\n".join(task.output()[-10:]))
|
||||
msg = "(%s) failed with task output: %s" % (task.uuid, "\n".join(task.output()[-10:]))
|
||||
done(exceptions.TaskFailedError(msg))
|
||||
except:
|
||||
log.ODM_WARNING("LRE: Could not retrieve task output for %s" % self)
|
||||
log.ODM_WARNING("LRE: Could not retrieve task output for %s (%s)" % (self, task.uuid))
|
||||
done(e)
|
||||
except Exception as e:
|
||||
done(e)
|
||||
|
|
|
@ -55,7 +55,8 @@ RUN apt-get install --no-install-recommends -y \
|
|||
python-pyproj \
|
||||
python-software-properties \
|
||||
python-wheel \
|
||||
swig2.0
|
||||
swig2.0 \
|
||||
grass-core
|
||||
|
||||
RUN apt-get remove libdc1394-22-dev
|
||||
RUN pip install --upgrade pip
|
||||
|
@ -117,15 +118,6 @@ RUN cd SuperBuild \
|
|||
&& cmake .. \
|
||||
&& make -j$(nproc)
|
||||
|
||||
RUN apt-get -y remove \
|
||||
git \
|
||||
build-essential \
|
||||
cmake \
|
||||
libgl1-mesa-dri \
|
||||
python-pip
|
||||
|
||||
RUN apt-get install -y libvtk6-dev grass-core
|
||||
|
||||
# Cleanup APT
|
||||
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue