From fb04f7c0fa29677208092a11c55f0aaae97eafd0 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 10 May 2019 10:05:44 -0400
Subject: [PATCH] Dockerfile fixes

---
 Dockerfile          | 12 ++----------
 opendm/remote.py    |  6 +++---
 portable.Dockerfile | 12 ++----------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d7249632..52b471dc 100644
--- a/Dockerfile
+++ b/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/* 
 
diff --git a/opendm/remote.py b/opendm/remote.py
index d80b8f64..38487758 100644
--- a/opendm/remote.py
+++ b/opendm/remote.py
@@ -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)
diff --git a/portable.Dockerfile b/portable.Dockerfile
index a9239085..362c3956 100644
--- a/portable.Dockerfile
+++ b/portable.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
@@ -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/*