diff --git a/.dockerignore b/utils/docker/.dockerignore similarity index 100% rename from .dockerignore rename to utils/docker/.dockerignore diff --git a/Dockerfile b/utils/docker/Dockerfile similarity index 94% rename from Dockerfile rename to utils/docker/Dockerfile index 7df6c1854156..a2a0f0cd9c1a 100644 --- a/Dockerfile +++ b/utils/docker/Dockerfile @@ -23,11 +23,10 @@ COPY . /usr/src/app RUN git clone https://github.com/ultralytics/yolov5 /usr/src/yolov5 # Downloads to user config dir -ADD https://ultralytics.com/assets/Arial.ttf /root/.config/Ultralytics/ +ADD https://ultralytics.com/assets/Arial.ttf https://ultralytics.com/assets/Arial.Unicode.ttf /root/.config/Ultralytics/ # Set environment variables ENV OMP_NUM_THREADS=8 -# ENV HOME=/usr/src/app # Usage Examples ------------------------------------------------------------------------------------------------------- diff --git a/utils/docker/Dockerfile-cpu b/utils/docker/Dockerfile-cpu new file mode 100644 index 000000000000..6e757baa3ef1 --- /dev/null +++ b/utils/docker/Dockerfile-cpu @@ -0,0 +1,37 @@ +# YOLOv5 🚀 by Ultralytics, GPL-3.0 license + +# Start FROM Ubuntu image https://hub.docker.com/_/ubuntu +FROM ubuntu:latest + +# Install linux packages +RUN apt update +RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y tzdata +RUN apt install -y python3-pip git zip curl htop screen libgl1-mesa-glx libglib2.0-0 +RUN alias python=python3 + +# Install python dependencies +COPY requirements.txt . +RUN python3 -m pip install --upgrade pip +RUN pip install --no-cache -r requirements.txt albumentations gsutil notebook \ + coremltools onnx onnx-simplifier onnxruntime openvino-dev tensorflow-cpu tensorflowjs \ + torch==1.11.0+cpu torchvision==0.12.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html + +# Create working directory +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +# Copy contents +COPY . /usr/src/app +RUN git clone https://github.com/ultralytics/yolov5 /usr/src/yolov5 + +# Downloads to user config dir +ADD https://ultralytics.com/assets/Arial.ttf https://ultralytics.com/assets/Arial.Unicode.ttf /root/.config/Ultralytics/ + + +# Usage Examples ------------------------------------------------------------------------------------------------------- + +# Build and Push +# t=ultralytics/yolov5:latest-cpu && sudo docker build -t $t . && sudo docker push $t + +# Pull and Run +# t=ultralytics/yolov5:latest-cpu && sudo docker pull $t && sudo docker run -it --ipc=host -v "$(pwd)"/datasets:/usr/src/datasets $t