Chiebot-Mirror
/
ultralytics
mirror of https://github.com/ultralytics/ultralytics.git
9
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Update Docker `COPY` permissions (#13200)

Browse Source 
Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com>
pull/13176/head
Glenn Jocher 6 months ago committed by GitHub
parent a07d6492eb
commit d80bd840d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 43 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      docker/Dockerfile
  2. 13
      docker/Dockerfile-arm64
  3. 14
      docker/Dockerfile-cpu
  4. 16
      docker/Dockerfile-jetson
  5. 13
      docker/Dockerfile-python

20
docker/Dockerfile
Unescape View File

@ -6,6 +6,11 @@
FROM pytorch/pytorch:2.2.2-cuda12.1-cudnn8-runtime FROM pytorch/pytorch:2.2.2-cuda12.1-cudnn8-runtime
RUN pip install --no-cache-dir nvidia-tensorrt --index-url https://pypi.ngc.nvidia.com RUN pip install --no-cache-dir nvidia-tensorrt --index-url https://pypi.ngc.nvidia.com
# Set environment variables
ENV APP_HOME /usr/src/ultralytics
# Avoid DDP error "MKL_THREADING_LAYER=INTEL is incompatible with libgomp.so.1 library" https://github.com/pytorch/pytorch/issues/37377
ENV MKL_THREADING_LAYER=GNU
# Downloads to user config dir # Downloads to user config dir
ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \
https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \ https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \
@ -22,12 +27,12 @@ RUN apt update \
RUN apt upgrade --no-install-recommends -y openssl tar RUN apt upgrade --no-install-recommends -y openssl tar
# Create working directory # Create working directory
WORKDIR /usr/src/ultralytics WORKDIR $APP_HOME
# Copy contents # Copy contents and assign permissions
# COPY . /usr/src/ultralytics # git permission issues inside container COPY . $APP_HOME
RUN git clone https://github.com/ultralytics/ultralytics -b main /usr/src/ultralytics RUN chown -R root:root $APP_HOME
ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt /usr/src/ultralytics/ ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt $APP_HOME
# Install pip packages # Install pip packages
RUN python3 -m pip install --upgrade pip wheel RUN python3 -m pip install --upgrade pip wheel
@ -44,11 +49,6 @@ RUN pip install --no-cache-dir numpy==1.23.5
# Remove exported models # Remove exported models
RUN rm -rf tmp RUN rm -rf tmp
# Set environment variables
ENV OMP_NUM_THREADS=1
# Avoid DDP error "MKL_THREADING_LAYER=INTEL is incompatible with libgomp.so.1 library" https://github.com/pytorch/pytorch/issues/37377
ENV MKL_THREADING_LAYER=GNU
# Usage Examples ------------------------------------------------------------------------------------------------------- # Usage Examples -------------------------------------------------------------------------------------------------------

13
docker/Dockerfile-arm64
Unescape View File

@ -6,6 +6,9 @@
# Start FROM Debian image for arm64v8 https://hub.docker.com/r/arm64v8/debian (new) # Start FROM Debian image for arm64v8 https://hub.docker.com/r/arm64v8/debian (new)
FROM arm64v8/debian:bookworm-slim FROM arm64v8/debian:bookworm-slim
# Set environment variables
ENV APP_HOME /usr/src/ultralytics
# Downloads to user config dir # Downloads to user config dir
ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \
https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \ https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \
@ -19,12 +22,12 @@ RUN apt update \
&& apt install --no-install-recommends -y python3-pip git zip curl htop gcc libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0 build-essential && apt install --no-install-recommends -y python3-pip git zip curl htop gcc libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0 build-essential
# Create working directory # Create working directory
WORKDIR /usr/src/ultralytics WORKDIR $APP_HOME
# Copy contents # Copy contents and assign permissions
# COPY . /usr/src/ultralytics # git permission issues inside container COPY . $APP_HOME
RUN git clone https://github.com/ultralytics/ultralytics -b main /usr/src/ultralytics RUN chown -R root:root $APP_HOME
ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt /usr/src/ultralytics/ ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt $APP_HOME
# Remove python3.11/EXTERNALLY-MANAGED to avoid 'externally-managed-environment' issue, Debian 12 Bookworm error # Remove python3.11/EXTERNALLY-MANAGED to avoid 'externally-managed-environment' issue, Debian 12 Bookworm error
RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED

14
docker/Dockerfile-cpu
Unescape View File

@ -5,6 +5,9 @@
# Start FROM Ubuntu image https://hub.docker.com/_/ubuntu # Start FROM Ubuntu image https://hub.docker.com/_/ubuntu
FROM ubuntu:23.10 FROM ubuntu:23.10
# Set environment variables
ENV APP_HOME /usr/src/ultralytics
# Downloads to user config dir # Downloads to user config dir
ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \
https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \ https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \
@ -16,12 +19,13 @@ RUN apt update \
&& apt install --no-install-recommends -y python3-pip git zip curl htop libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0 && apt install --no-install-recommends -y python3-pip git zip curl htop libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0
# Create working directory # Create working directory
WORKDIR /usr/src/ultralytics WORKDIR $APP_HOME
# Copy contents # Copy contents (previously used git clone to avoid permission errors)
# COPY . /usr/src/ultralytics # git permission issues inside container COPY . $APP_HOME
RUN git clone https://github.com/ultralytics/ultralytics -b main /usr/src/ultralytics RUN chown -R root:root $APP_HOME
ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt /usr/src/ultralytics/ # RUN git clone https://github.com/ultralytics/ultralytics -b main $APP_HOME
ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt $APP_HOME
# Remove python3.11/EXTERNALLY-MANAGED or use 'pip install --break-system-packages' avoid 'externally-managed-environment' Ubuntu nightly error # Remove python3.11/EXTERNALLY-MANAGED or use 'pip install --break-system-packages' avoid 'externally-managed-environment' Ubuntu nightly error
RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED

16
docker/Dockerfile-jetson
Unescape View File

@ -5,6 +5,9 @@
# Start FROM https://catalog.ngc.nvidia.com/orgs/nvidia/containers/l4t-pytorch # Start FROM https://catalog.ngc.nvidia.com/orgs/nvidia/containers/l4t-pytorch
FROM nvcr.io/nvidia/l4t-pytorch:r35.2.1-pth2.0-py3 FROM nvcr.io/nvidia/l4t-pytorch:r35.2.1-pth2.0-py3
# Set environment variables
ENV APP_HOME /usr/src/ultralytics
# Downloads to user config dir # Downloads to user config dir
ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \
https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \ https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \
@ -18,12 +21,12 @@ RUN apt update \
&& apt install --no-install-recommends -y gcc git zip curl htop libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0 && apt install --no-install-recommends -y gcc git zip curl htop libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0
# Create working directory # Create working directory
WORKDIR /usr/src/ultralytics WORKDIR $APP_HOME
# Copy contents # Copy contents and assign permissions
# COPY . /usr/src/ultralytics # git permission issues inside container COPY . $APP_HOME
RUN git clone https://github.com/ultralytics/ultralytics -b main /usr/src/ultralytics RUN chown -R root:root $APP_HOME
ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt /usr/src/ultralytics/ ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt $APP_HOME
# Remove opencv-python from Ultralytics dependencies as it conflicts with opencv-python installed in base image # Remove opencv-python from Ultralytics dependencies as it conflicts with opencv-python installed in base image
RUN grep -v "opencv-python" pyproject.toml > temp.toml && mv temp.toml pyproject.toml RUN grep -v "opencv-python" pyproject.toml > temp.toml && mv temp.toml pyproject.toml
@ -37,9 +40,6 @@ RUN pip install onnxruntime_gpu-1.15.1-cp38-cp38-linux_aarch64.whl
RUN pip install --no-cache-dir tqdm matplotlib pyyaml psutil pandas onnx RUN pip install --no-cache-dir tqdm matplotlib pyyaml psutil pandas onnx
RUN pip install --no-cache-dir -e ".[export]" RUN pip install --no-cache-dir -e ".[export]"
# Set environment variables
ENV OMP_NUM_THREADS=1
# Usage Examples ------------------------------------------------------------------------------------------------------- # Usage Examples -------------------------------------------------------------------------------------------------------

13
docker/Dockerfile-python
Unescape View File

@ -5,6 +5,9 @@
# Use the official Python 3.10 slim-bookworm as base image # Use the official Python 3.10 slim-bookworm as base image
FROM python:3.10-slim-bookworm FROM python:3.10-slim-bookworm
# Set environment variables
ENV APP_HOME /usr/src/ultralytics
# Downloads to user config dir # Downloads to user config dir
ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \ ADD https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.ttf \
https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \ https://github.com/ultralytics/assets/releases/download/v0.0.0/Arial.Unicode.ttf \
@ -16,12 +19,12 @@ RUN apt update \
&& apt install --no-install-recommends -y python3-pip git zip curl htop libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0 && apt install --no-install-recommends -y python3-pip git zip curl htop libgl1 libglib2.0-0 libpython3-dev gnupg g++ libusb-1.0-0
# Create working directory # Create working directory
WORKDIR /usr/src/ultralytics WORKDIR $APP_HOME
# Copy contents # Copy contents and assign permissions
# COPY . /usr/src/ultralytics # git permission issues inside container COPY . $APP_HOME
RUN git clone https://github.com/ultralytics/ultralytics -b main /usr/src/ultralytics RUN chown -R root:root $APP_HOME
ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt /usr/src/ultralytics/ ADD https://github.com/ultralytics/assets/releases/download/v8.2.0/yolov8n.pt $APP_HOME
# Remove python3.11/EXTERNALLY-MANAGED or use 'pip install --break-system-packages' avoid 'externally-managed-environment' Ubuntu nightly error # Remove python3.11/EXTERNALLY-MANAGED or use 'pip install --break-system-packages' avoid 'externally-managed-environment' Ubuntu nightly error
# RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED # RUN rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED

Write Preview
Loading…
Cancel
Save