From 431fad683410bc4aafb6c97f0e6f1e4c8c4a622f Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Fri, 16 Jun 2023 18:06:58 +0200
Subject: [PATCH] Update Dockerfile-jetson (#3209)

---
 docker/Dockerfile-jetson | 3 +++
 requirements.txt         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile-jetson b/docker/Dockerfile-jetson
index 6fbbd5d..0182f2c 100644
--- a/docker/Dockerfile-jetson
+++ b/docker/Dockerfile-jetson
@@ -23,6 +23,9 @@ WORKDIR /usr/src/ultralytics
 RUN git clone https://github.com/ultralytics/ultralytics /usr/src/ultralytics
 ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/yolov8n.pt /usr/src/ultralytics/
 
+# Remove opencv-python from requirements.txt as it conflicts with opencv-python installed in base image
+RUN grep -v '^opencv-python' requirements.txt > tmp.txt && mv tmp.txt requirements.txt
+
 # Install pip packages manually for TensorRT compatibility https://github.com/NVIDIA/TensorRT/issues/2567
 RUN python3 -m pip install --upgrade pip wheel
 RUN pip install --no-cache tqdm matplotlib pyyaml psutil pandas onnx thop "numpy==1.23"
diff --git a/requirements.txt b/requirements.txt
index 78b85e0..c062769 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 
 # Base ----------------------------------------
 matplotlib>=3.2.2
-opencv-python>=4.5.0  # <=4.5.0 required for Jetson Docker https://github.com/ultralytics/ultralytics/issues/3183
+opencv-python>=4.6.0
 Pillow>=7.1.2
 PyYAML>=5.3.1
 requests>=2.23.0