From d6e2ec1483a3a3e5404b8b6f61653b3617812371 Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Fri, 16 Jun 2023 15:10:36 +0200
Subject: [PATCH] Jetson Docker fix `opencv-python>=4.5.0` (#3208)

---
 .github/workflows/docker.yaml | 14 ++++++++++++++
 requirements.txt              |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 5838920..ae12c6b 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -6,6 +6,16 @@ name: Publish Docker Images
 on:
   push:
     branches: [main]
+  workflow_dispatch:
+    inputs:
+      image:
+        type: choice
+        description: Select Docker Image
+        options:
+        - Arm64
+        - Jetson
+        - CPU
+        - GPU
 
 jobs:
   docker:
@@ -29,6 +39,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push arm64 image
+        if: github.event_name == 'push' || github.event.inputs.image == 'Arm64'
         uses: docker/build-push-action@v4
         continue-on-error: true
         with:
@@ -39,6 +50,7 @@ jobs:
           tags: ultralytics/ultralytics:latest-arm64
 
       - name: Build and push Jetson image
+        if: github.event_name == 'push' || github.event.inputs.image == 'Jetson'
         uses: docker/build-push-action@v4
         continue-on-error: true
         with:
@@ -49,6 +61,7 @@ jobs:
           tags: ultralytics/ultralytics:latest-jetson
 
       - name: Build and push CPU image
+        if: github.event_name == 'push' || github.event.inputs.image == 'CPU'
         uses: docker/build-push-action@v4
         continue-on-error: true
         with:
@@ -58,6 +71,7 @@ jobs:
           tags: ultralytics/ultralytics:latest-cpu
 
       - name: Build and push GPU image
+        if: github.event_name == 'push' || github.event.inputs.image == 'GPU'
         uses: docker/build-push-action@v4
         continue-on-error: true
         with:
diff --git a/requirements.txt b/requirements.txt
index c062769..78b85e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 
 # Base ----------------------------------------
 matplotlib>=3.2.2
-opencv-python>=4.6.0
+opencv-python>=4.5.0  # <=4.5.0 required for Jetson Docker https://github.com/ultralytics/ultralytics/issues/3183
 Pillow>=7.1.2
 PyYAML>=5.3.1
 requests>=2.23.0