Merge pull request #35 from nglcobdai/dev

[v1.2.0] GPU環境の修正

Author: nglcobdai

Dockerfile.dev

@@ -1,53 +1,38 @@
-FROM ubuntu:22.04
+FROM nvidia/cuda:12.1.0-cudnn8-runtime-ubuntu22.04
 
 ENV LANG=C.UTF-8 \
     LANGUAGE=en_US \
-    PYTHONPATH="/root/workspace/app:$PYTHONPATH" \
+    PYTHONPATH="/root/workspace:$PYTHONPATH" \
     DEBIAN_FRONTEND=noninteractive
 
-# 基本ツールのインストール
-RUN apt-get update && apt-get install -y wget gnupg software-properties-common \
-    && rm -rf /var/lib/apt/lists/*
-
 # Pythonのインストール
 RUN apt-get update && apt-get install -y python3.10 python3-pip \
     && ln -s /usr/bin/python3.10 /usr/bin/python \
     && rm -rf /var/lib/apt/lists/*
 
-# CUDAをインストール
-RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin \
-    && mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600
-RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
-RUN add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /" \
-    && apt-get update
-RUN apt-get install -y cuda-12-4 \
-    && rm -rf /var/lib/apt/lists/*
-ENV LD_LIBRARY_PATH="/usr/local/cuda-12.4/lib64:$LD_LIBRARY_PATH" \
-    PATH="/usr/local/cuda-12.4/bin:$PATH"
-
 # システム依存のライブラリをインストール
-RUN apt-get update && apt-get install -y libgl1-mesa-glx \
+RUN apt-get update && apt-get install -y \
+    libgl1-mesa-glx \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root/workspace
 
-# pyproject.toml、poetry.lock、poetry.tomlをコピーする
-COPY pyproject.toml poetry.lock poetry.toml $WORKDIR/
-
 # Poetryのインストールと依存関係のインストール
 RUN pip install --no-cache-dir --upgrade pip \
     && pip install --upgrade poetry
 
+# pyproject.toml、poetry.lock、poetry.tomlをコピーする
+COPY pyproject.toml poetry.lock poetry.toml $WORKDIR/
+
+RUN poetry install --no-root
+
 # Temporary directory for Poetry and torch installation
 ENV TMPDIR=/root/workspace/tmp
 RUN mkdir -p $TMPDIR
 
+# OpenAI-Whisperに必要なライブラリをインストール
+RUN apt-get update && apt-get install -y ffmpeg
+
 # Clear cache to free up space
 RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN poetry install --no-root
-
-# OpenAI-Whisperに必要なライブラリをインストール
-RUN apt-get update && apt-get install -y ffmpeg \
-    && rm -rf /var/lib/apt/lists/*

Dockerfile.prod

@@ -1,58 +1,38 @@
-FROM ubuntu:22.04
+FROM nvidia/cuda:12.1.0-cudnn8-runtime-ubuntu22.04
 
 ENV LANG=C.UTF-8 \
     LANGUAGE=en_US \
-    PYTHONPATH="/root/workspace/app:$PYTHONPATH" \
+    PYTHONPATH="/root/workspace:$PYTHONPATH" \
     DEBIAN_FRONTEND=noninteractive
 
-# 基本ツールのインストール
-RUN apt-get update && apt-get install -y wget gnupg software-properties-common \
-    && rm -rf /var/lib/apt/lists/*
-
 # Pythonのインストール
 RUN apt-get update && apt-get install -y python3.10 python3-pip \
     && ln -s /usr/bin/python3.10 /usr/bin/python \
     && rm -rf /var/lib/apt/lists/*
 
-# CUDAをインストール
-RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin \
-    && mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600
-RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
-RUN add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /" \
-    && apt-get update
-RUN apt-get install -y cuda-12-4 \
-    && rm -rf /var/lib/apt/lists/*
-ENV LD_LIBRARY_PATH="/usr/local/cuda-12.4/lib64:$LD_LIBRARY_PATH" \
-    PATH="/usr/local/cuda-12.4/bin:$PATH"
-
 # システム依存のライブラリをインストール
-RUN apt-get update && apt-get install -y libgl1-mesa-glx \
+RUN apt-get update && apt-get install -y \
+    libgl1-mesa-glx \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root/workspace
 
-# pyproject.toml、poetry.lock、poetry.tomlをコピーする
-COPY pyproject.toml poetry.lock poetry.toml $WORKDIR/
-
 # Poetryのインストールと依存関係のインストール
 RUN pip install --no-cache-dir --upgrade pip \
     && pip install --upgrade poetry
 
+# pyproject.toml、poetry.lock、poetry.tomlをコピーする
+COPY pyproject.toml poetry.lock poetry.toml $WORKDIR/
+
+RUN poetry install --no-root --no-dev
+
 # Temporary directory for Poetry and torch installation
 ENV TMPDIR=/root/workspace/tmp
 RUN mkdir -p $TMPDIR
 
-# Poetry cache clear
-RUN poetry cache clear pypi --all --no-interaction \
-    && poetry cache clear cache --all --no-interaction
+# OpenAI-Whisperに必要なライブラリをインストール
+RUN apt-get update && apt-get install -y ffmpeg
 
 # Clear cache to free up space
 RUN apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Poetryの依存関係インストール
-RUN poetry install --no-root --no-dev
-
-# OpenAI-Whisperに必要なライブラリをインストール
-RUN apt-get update && apt-get install -y ffmpeg \
-    && rm -rf /var/lib/apt/lists/*

README.md

@@ -7,7 +7,7 @@ It is intended to be used in combination with [Auto Unlock App](https://github.c
 |                 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | --------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **License**     | ![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)                                                                                                                                                                                                                                                                                                                                                                                                            |
-| **Environment** | ![Ubuntu](https://img.shields.io/badge/-Ubuntu_22.04_LTS-fad9c1.svg?logo=ubuntu&style=flat) <br> ![Docker](https://img.shields.io/badge/-Docker_v26.0.2-0055a4.svg?logo=docker&style=flat) ![Docker Compose](https://img.shields.io/badge/-Docker_Compose_v2.22.0-0055a4.svg?logo=docker&style=flat) <br> ![CUDA](https://img.shields.io/badge/-CUDA_12.5-a4d17c.svg?logo=nvidia&style=flat) ![Python](https://img.shields.io/badge/-Python_3.10-F9DC3E.svg?logo=python&style=flat) |
+| **Environment** | ![Ubuntu](https://img.shields.io/badge/-Ubuntu_22.04_LTS-fad9c1.svg?logo=ubuntu&style=flat) <br> ![Docker](https://img.shields.io/badge/-Docker_v26.0.2-0055a4.svg?logo=docker&style=flat) ![Docker Compose](https://img.shields.io/badge/-Docker_Compose_v2.22.0-0055a4.svg?logo=docker&style=flat) <br> ![CUDA](https://img.shields.io/badge/-CUDA_12.1-a4d17c.svg?logo=nvidia&style=flat) ![Python](https://img.shields.io/badge/-Python_3.10-F9DC3E.svg?logo=python&style=flat) |
 | **Technology**  | ![Poetry](https://img.shields.io/badge/-Poetry-2c2d72.svg?logo=python&style=flat) ![FastAPI](https://img.shields.io/badge/-FastAPI-80cbc4.svg?logo=fastapi&style=flat) ![MongoDB](https://img.shields.io/badge/-MongoDB-2e5235.svg?logo=mongodb&style=flat) <br> ![OpenAI-Whisper](https://img.shields.io/badge/-OpenAI_Whisper-e40084.svg?logo=openai&style=flat) ![SwitchBot API](https://img.shields.io/badge/-SwitchBot_API_v1.1-fc6203.svg?logo=SwitchBot&style=flat)          |
 |                 |
 
@@ -18,7 +18,7 @@ It is intended to be used in combination with [Auto Unlock App](https://github.c
   - `Docker`: `v26.0.2`
   - `Docker Compose`: `v2.22.0`
 
-- CUDA is required.
+- Nvidia Driver is required for CUDA `12.1`.
 
 - Whisper model is used. Please refer to the official [github](https://github.com/openai/whisper) for the device requirements.
 

docker-compose.dev.yml

@@ -25,7 +25,9 @@ services:
       resources:
         reservations:
           devices:
-            - capabilities: [gpu]
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
 
   mongodb:
     image: mongo:5.0.4

docker-compose.prod.yml

@@ -25,7 +25,9 @@ services:
       resources:
         reservations:
           devices:
-            - capabilities: [gpu]
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
 
   mongodb:
     image: mongo:5.0.4