Reorder Dockerfile for reduced rebuilding (ultralytics#358)

docker/Dockerfile

@@ -4,7 +4,12 @@
 
 # Start FROM NVIDIA PyTorch image https://ngc.nvidia.com/catalog/containers/nvidia:pytorch
 FROM nvcr.io/nvidia/pytorch:22.12-py3
+
+# Remove torch nightly and install torch stable
 RUN rm -rf /opt/pytorch  # remove 1.2GB dir
+RUN pip uninstall -y torchtext torch torchvision
+RUN pip cache purge
+RUN pip install --no-cache torch torchvision
 
 # Downloads to user config dir
 ADD https://ultralytics.com/assets/Arial.ttf https://ultralytics.com/assets/Arial.Unicode.ttf /root/.config/Ultralytics/
@@ -22,10 +27,7 @@ RUN git clone https://github.com/ultralytics/ultralytics /usr/src/ultralytics
 
 # Install pip packages
 RUN python -m pip install --upgrade pip wheel
-RUN pip uninstall -y Pillow torchtext torch torchvision
-RUN pip install --no-cache ultralytics albumentations comet gsutil notebook Pillow>=9.1.0 \
-    'opencv-python<4.6.0.66' \
-    --extra-index-url https://download.pytorch.org/whl/cu113
+RUN pip install --no-cache ultralytics albumentations comet gsutil notebook 'opencv-python<4.6.0.66'
 
 # Set environment variables
 ENV OMP_NUM_THREADS=1

docker/Dockerfile-arm64

@@ -27,10 +27,8 @@ RUN git clone https://github.com/ultralytics/ultralytics /usr/src/ultralytics
 COPY requirements.txt .
 RUN python3 -m pip install --upgrade pip wheel
 RUN pip install --no-cache ultralytics gsutil notebook \
-    tensorflow-aarch64
+    tensorflow-aarch64 onnx onnx-simplifier onnxruntime coremltools openvino-dev
     # tensorflowjs \
-    # onnx onnx-simplifier onnxruntime \
-    # coremltools openvino-dev \
 
 # Cleanup
 ENV DEBIAN_FRONTEND teletype

docker/Dockerfile-cpu

@@ -28,7 +28,8 @@ COPY requirements.txt .
 RUN python3 -m pip install --upgrade pip wheel
 RUN pip install --no-cache ultralytics albumentations gsutil notebook \
     coremltools onnx onnx-simplifier onnxruntime tensorflow-cpu tensorflowjs \
-    # openvino-dev \
+    openvino-dev \
+    # tensorflowjs \
     --extra-index-url https://download.pytorch.org/whl/cpu
 
 # Cleanup