Fix Public Dockerfiles (#35)

luxonis · Sep 25, 2024 · 9eabe12 · 9eabe12
1 parent 2267fbf
commit 9eabe12
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/docker/bases/Dockerfile.base-hailo b/docker/bases/Dockerfile.base-hailo
@@ -12,7 +12,7 @@ RUN pip install --upgrade pip && \
         https://developer.download.nvidia.com/compute/redist \
         nvidia-dali-tf-plugin-cuda110
 
-RUN rm -r \
+RUN rm -rf \
     /local/workspace/tappas \
     /opt/google \
     /local/workspace/doc \
@@ -27,4 +27,4 @@ RUN pip install pip-autoremove && \
                       tensorboard pip-autoremove && \
     pip install psutil && \
     pip cache purge  && \
-    rm -r ~/.cache
+    rm -rf ~/.cache
diff --git a/docker/hailo/Dockerfile.public b/docker/hailo/Dockerfile.public
@@ -12,7 +12,7 @@ RUN pip install --upgrade pip && \
     https://developer.download.nvidia.com/compute/redist \
     nvidia-dali-tf-plugin-cuda110
 
-RUN rm -r \
+RUN rm -rf \
     /local/workspace/tappas \
     /opt/google \
     /local/workspace/doc \
@@ -27,7 +27,7 @@ RUN pip install pip-autoremove && \
     tensorboard pip-autoremove && \
     pip install psutil && \
     pip cache purge  && \
-    rm -r ~/.cache
+    rm -rf ~/.cache
 
 WORKDIR /app
 COPY docker/hailo/entrypoint.sh /app/entrypoint.sh

diff --git a/docker/rvc4/Dockerfile b/docker/rvc4/Dockerfile
@@ -8,16 +8,18 @@ RUN apt-get update && \
 COPY --link docker/extra_packages/snpe.zip .
 RUN unzip snpe.zip -d /opt
 
-RUN rm -r /opt/snpe/Uninstall && \
-    rm -r /opt/snpe/docs && \
-    rm -r /opt/snpe/examples && \
-    rm -r /opt/snpe/lib/hexagon* && \
-    rm -r /opt/snpe/lib/*android* && \
-    rm -r /opt/snpe/lib/*ubuntu* && \
-    rm -r /opt/snpe/lib/*windows* && \
-    rm -r /opt/snpe/bin/*windows* && \
-    rm -r /opt/snpe/bin/*android* && \
-    rm -r /opt/snpe/bin/*ubuntu*
+RUN ls /opt/quairt && mv /opt/qairt/* /opt/snpe || true
+
+RUN rm -rf /opt/snpe/Uninstall && \
+    rm -rf /opt/snpe/docs && \
+    rm -rf /opt/snpe/examples && \
+    rm -rf /opt/snpe/lib/hexagon* && \
+    rm -rf /opt/snpe/lib/*android* && \
+    rm -rf /opt/snpe/lib/*ubuntu* && \
+    rm -rf /opt/snpe/lib/*windows* && \
+    rm -rf /opt/snpe/bin/*windows* && \
+    rm -rf /opt/snpe/bin/*android* && \
+    rm -rf /opt/snpe/bin/*ubuntu*
 
 RUN pip install --upgrade pip
 COPY --link requirements.txt .

diff --git a/modelconverter/utils/docker_utils.py b/modelconverter/utils/docker_utils.py
@@ -96,7 +96,7 @@ def get_docker_image(target: str, tag: str) -> str:
         image.tag(repository, tag)
 
     except (docker.errors.APIError, docker.errors.DockerException):
-        logger.warning(f"Image {repository} not found, building image...")
+        logger.error("Failed to pull image, building it locally...")
         docker_build(target, tag)
 
     return image_name