release

2025-06-15 21:23:51 +00:00
parent 42dd563205
commit c737cd8210
5 changed files with 164 additions and 507 deletions
@@ -1,29 +1,22 @@
-# deployment/container/Dockerfile
-# Vector DB API Service Image - 수정 버전
-ARG BASE_IMAGE=vector-api-base:optimized-dotenv-0.9.9-v1.0
+ARG BASE_IMAGE=vector-api-base:latest
 FROM ${BASE_IMAGE}

-# 메타데이터
 LABEL maintainer="admin@example.com"
-LABEL version="1.0.7-fixed"
-LABEL description="Vector DB API Service - Fixed Poetry Environment"
+LABEL version="latest"
+LABEL description="Vector DB API Service - Cache Problem Fixed"

-# 🔧 사용자 정보 수정 (root 권한으로)
+# root로 전환
 USER root
 RUN echo "appuser:x:1000:1000:App User:/home/appuser:/bin/bash" >> /etc/passwd && \
    echo "appuser:x:1000:" >> /etc/group

 # appuser로 전환
 USER appuser
-
-# 작업 디렉토리 설정
 WORKDIR /home/appuser

-# 🔧 Poetry 프로젝트 파일 복사 (중요!)
-COPY pyproject.toml poetry.lock ./
-
-# 🔧 Base Image의 패키지를 현재 프로젝트에서 사용 가능하도록 설정
-RUN poetry install --only=main --no-root
+# 🔧 중요: pyproject.toml과 poetry.lock은 이미 Base Image에 있음
+# 추가 패키지가 필요한 경우에만 설치
+# RUN poetry install --only=main --no-root  # ❌ 이미 설치됨

 # 🚀 애플리케이션 소스 코드 복사
 COPY app/ app/
@@ -31,6 +24,10 @@ COPY app/ app/
 # 포트 노출
 EXPOSE 8000

+# 헬스체크
+HEALTHCHECK --interval=30s --timeout=15s --start-period=45s --retries=3 \
+    CMD poetry run python -c "import fastapi; print('OK')" || exit 1
+
 # 🛠️ 디버깅용: 컨테이너를 계속 실행 상태로 유지
-CMD ["sleep", "infinity"]
-#CMD ["poetry", "run", "python", "app/main.py"]
+#CMD ["sleep", "infinity"]
+CMD ["poetry", "run", "python", "app/main.py"]
@@ -1,147 +1,60 @@
-# deployment/container/Dockerfile-base
-# 최적화된 Poetry 기반 Vector DB API Base Image - 필수 라이브러리만 설치
-
 FROM python:3.11-slim

-# 메타데이터
-LABEL description="Optimized Vector DB API Base Image with Poetry - dotenv 0.9.9 package"
-LABEL version="optimized-dotenv-0.9.9-v1.0"
+LABEL description="Vector DB API Base Image - Cache Fixed"
+LABEL version="cache-fixed-v1.0"
 LABEL maintainer="admin@example.com"

-# 환경 변수 설정 - Poetry 가상환경을 홈 디렉토리로 이동
+# 환경 변수 설정
 ENV PYTHONDONTWRITEBYTECODE=1 \
    PYTHONUNBUFFERED=1 \
    DEBIAN_FRONTEND=noninteractive \
    PIP_NO_CACHE_DIR=1 \
    PIP_DISABLE_PIP_VERSION_CHECK=1 \
    POETRY_NO_INTERACTION=1 \
-    POETRY_VENV_IN_PROJECT=false \
+    POETRY_VENV_IN_PROJECT=true \
    POETRY_VIRTUALENVS_CREATE=true \
-    POETRY_VIRTUALENVS_PATH=/home/appuser/.cache/pypoetry/venvs \
-    POETRY_CACHE_DIR=/home/appuser/.cache/pypoetry/cache \
-    POETRY_CONFIG_DIR=/home/appuser/.config/pypoetry \
-    POETRY_DATA_DIR=/home/appuser/.local/share/pypoetry \
+    POETRY_VIRTUALENVS_PATH=/home/appuser/.venv \
+    POETRY_CACHE_DIR=/home/appuser/.cache/pypoetry \
    HF_HUB_CACHE=/home/appuser/.cache/huggingface \
-    TRANSFORMERS_CACHE=/home/appuser/.cache/transformers \
-    SENTENCE_TRANSFORMERS_HOME=/home/appuser/.cache/sentence_transformers
+    TRANSFORMERS_CACHE=/home/appuser/.cache/transformers

-# 🔧 시스템 패키지 설치 (최소화)
+# 시스템 패키지 설치
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    gcc \
-    g++ \
-    python3-dev \
-    curl \
-    wget \
-    ca-certificates \
-    git \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
+    build-essential gcc g++ python3-dev \
+    curl wget ca-certificates git \
+    && rm -rf /var/lib/apt/lists/* && apt-get clean

-# 📦 pip 업그레이드
+# pip 업그레이드
 RUN python3.11 -m pip install --no-cache-dir --upgrade pip setuptools wheel

-# 👤 비root 사용자 생성 (UID/GID를 명시적으로 1000으로 설정)
+# 사용자 생성
 RUN groupadd -g 1000 appuser && \
    useradd -r -u 1000 -g 1000 -d /home/appuser -s /bin/bash appuser && \
-    mkdir -p /home/appuser && \
-    chown -R 1000:1000 /home/appuser
+    mkdir -p /home/appuser && chown -R 1000:1000 /home/appuser

-# 🔧 Poetry 디렉토리 생성 (config 디렉토리 추가)
-RUN mkdir -p /home/appuser/.cache/pypoetry/venvs \
-             /home/appuser/.cache/pypoetry/cache \
-             /home/appuser/.config/pypoetry \
-             /home/appuser/.local/share/pypoetry && \
-    chown -R appuser:appuser /home/appuser/.cache && \
-    chown -R appuser:appuser /home/appuser/.config && \
-    chown -R appuser:appuser /home/appuser/.local && \
-    chmod -R 755 /home/appuser/.cache && \
-    chmod -R 755 /home/appuser/.config && \
-    chmod -R 755 /home/appuser/.local
+# 작업 디렉토리 설정
+WORKDIR /home/appuser
+RUN chown appuser:appuser /home/appuser

-# 🐍 Poetry를 appuser로 설치
+# 🔧 핵심: 고정된 pyproject.toml 생성
+COPY pyproject.toml poetry.lock ./
+RUN chown appuser:appuser pyproject.toml poetry.lock
+
+# appuser로 전환
 USER appuser
-ENV PATH="/home/appuser/.local/bin:$PATH"

+# 🔧 Poetry를 appuser로 설치
+ENV PATH="/home/appuser/.local/bin:$PATH"
 RUN curl -sSL https://install.python-poetry.org | python3.11 -

-# Poetry 실행 권한 및 심볼릭 링크
-USER root
-RUN chmod +x /home/appuser/.local/bin/poetry && \
-    ln -sf /home/appuser/.local/bin/poetry /usr/local/bin/poetry && \
-    chown appuser:appuser /home/appuser/.local/bin/poetry
-
-# appuser로 다시 전환
-USER appuser
-
-# 🔧 Poetry 설정
-RUN poetry config virtualenvs.in-project false && \
+# 🔧 Poetry 환경 설정 (프로젝트 내 가상환경)
+RUN poetry config virtualenvs.in-project true && \
    poetry config virtualenvs.create true && \
-    poetry config virtualenvs.path /home/appuser/.cache/pypoetry/venvs && \
-    poetry config cache-dir /home/appuser/.cache/pypoetry/cache
+    poetry config cache-dir /home/appuser/.cache/pypoetry

-# 🏗️ 작업 디렉토리 설정
-WORKDIR /home/appuser
+# 🔧 의존성 설치
+RUN poetry install --only=main --no-root

-# 애플리케이션 디렉토리 생성
-USER root
-RUN mkdir -p /home/appuser/app && \
-    chown appuser:appuser /home/appuser/app
-USER appuser
-
-# 🔧 간단한 pyproject.toml 생성 (dotenv 0.9.9 사용)
-RUN cat > pyproject.toml << 'EOF'
-[tool.poetry]
-name = "vector-api"
-version = "1.0.0"
-description = "Vector DB API with AI/ML capabilities"
-authors = ["Developer <dev@example.com>"]
-packages = [{include = "app"}]
-
-[tool.poetry.dependencies]
-python = "^3.11"
-python-dotenv = "^1.1.0"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-EOF
-
-# 🔧 Poetry 의존성 설치 (최적화된 순서)
-RUN echo "🚀 최적화된 의존성 설치 시작..." && \
-    \
-    echo "1️⃣ 기본 웹 프레임워크 설치..." && \
-    poetry add fastapi==0.115.9 && \
-    poetry add "uvicorn[standard]" pydantic python-dotenv && \
-    \
-    echo "2️⃣ HTTP 클라이언트 설치..." && \
-    poetry add aiohttp requests && \
-    \
-    echo "3️⃣ PyTorch CPU 버전 설치..." && \
-    poetry source add pytorch-cpu https://download.pytorch.org/whl/cpu --priority=supplemental && \
-    poetry add torch==2.7.1+cpu --source pytorch-cpu && \
-    \
-    echo "4️⃣ AI/ML 라이브러리 설치..." && \
-    poetry add tokenizers transformers huggingface-hub && \
-    poetry add sentence-transformers && \
-    \
-    echo "5️⃣ 벡터 DB 라이브러리 설치..." && \
-    poetry add chromadb duckdb hnswlib && \
-    \
-    echo "6️⃣ Claude AI 라이브러리 설치..." && \
-    poetry add anthropic && \
-    \
-    echo "✅ 최적화된 의존성 설치 완료!"
-
-# 🧹 캐시 정리 (컨테이너 크기 최소화)
-RUN poetry cache clear pypi --all && \
-    rm -rf /home/appuser/.cache/pip && \
-    find /home/appuser/.cache -name "*.pyc" -delete && \
-    find /home/appuser/.cache -name "__pycache__" -type d -exec rm -rf {} + 2>/dev/null || true
-
-# 🏁 최종 설정
 EXPOSE 8000
-WORKDIR /home/appuser
-
-# 🔧 베이스 이미지 테스트용 CMD (실제 서비스에서는 오버라이드됨)
 CMD ["poetry", "--version"]
+
@@ -1,139 +0,0 @@
-# deployment/container/Dockerfile-base
-# Poetry 기반 Vector DB API Base Image - 홈 디렉토리 사용 (안전한 방식)
-
-FROM python:3.11-slim
-
-# 메타데이터
-LABEL description="Vector DB API Base Image with Poetry - Home Directory"
-LABEL version="poetry-home-v1.0"
-LABEL maintainer="admin@example.com"
-
-# 환경 변수 설정 - Poetry 가상환경을 홈 디렉토리로 이동
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    DEBIAN_FRONTEND=noninteractive \
-    PIP_NO_CACHE_DIR=1 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    POETRY_NO_INTERACTION=1 \
-    POETRY_VENV_IN_PROJECT=false \
-    POETRY_VIRTUALENVS_CREATE=true \
-    POETRY_VIRTUALENVS_PATH=/home/appuser/.cache/pypoetry/venvs \
-    POETRY_CACHE_DIR=/home/appuser/.cache/pypoetry/cache \
-    HF_HUB_CACHE=/home/appuser/.cache/huggingface \
-    TRANSFORMERS_CACHE=/home/appuser/.cache/transformers \
-    SENTENCE_TRANSFORMERS_HOME=/home/appuser/.cache/sentence_transformers
-
-# 🔧 시스템 패키지 설치
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    gcc \
-    g++ \
-    python3-dev \
-    curl \
-    wget \
-    ca-certificates \
-    git \
-    sudo \
-    lsb-release \
-    bc \
-    python3.11 \
-    python3.11-venv \
-    python3.11-dev \
-    python3.11-distutils \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
-
-# 📦 pip 업그레이드
-RUN python3.11 -m pip install --no-cache-dir --upgrade pip setuptools wheel
-
-# 👤 비root 사용자 생성 (Poetry 설치 전에)
-RUN groupadd -r appuser && \
-    useradd -r -g appuser -d /home/appuser -s /bin/bash appuser && \
-    mkdir -p /home/appuser && \
-    chown -R appuser:appuser /home/appuser
-
-# 🔧 Poetry 가상환경 디렉토리 생성 (홈 디렉토리 사용)
-RUN mkdir -p /home/appuser/.cache/pypoetry/venvs \
-             /home/appuser/.cache/pypoetry/cache && \
-    chown -R appuser:appuser /home/appuser/.cache && \
-    chmod -R 755 /home/appuser/.cache
-
-# 🐍 Poetry를 appuser로 설치
-USER appuser
-ENV PATH="/home/appuser/.local/bin:$PATH"
-
-# appuser 홈 디렉토리에 Poetry 설치
-RUN curl -sSL https://install.python-poetry.org | python3.11 -
-
-# Poetry 실행 권한 및 심볼릭 링크 (root 권한 필요)
-USER root
-RUN chmod +x /home/appuser/.local/bin/poetry && \
-    ln -sf /home/appuser/.local/bin/poetry /usr/local/bin/poetry && \
-    chown appuser:appuser /home/appuser/.local/bin/poetry
-
-# appuser로 다시 전환
-USER appuser
-
-# 🔧 Poetry 설정 - 가상환경을 홈 디렉토리로 이동
-RUN poetry config virtualenvs.in-project false && \
-    poetry config virtualenvs.create true && \
-    poetry config virtualenvs.path /home/appuser/.cache/pypoetry/venvs && \
-    poetry config cache-dir /home/appuser/.cache/pypoetry/cache
-
-# Poetry 버전 확인 및 설정 검증
-RUN poetry --version && \
-    poetry config --list && \
-    ls -la /home/appuser/.local/bin/poetry && \
-    which poetry
-
-# 🏗️ 작업 디렉토리 설정 (홈 디렉토리 사용)
-WORKDIR /home/appuser
-
-# 애플리케이션 디렉토리 생성
-USER root
-RUN mkdir -p /home/appuser/app && \
-    chown -R appuser:appuser /home/appuser
-
-# 📋 Poetry 설치 스크립트 복사 및 권한 설정
-COPY setup.sh /home/appuser/setup.sh
-RUN chmod +x /home/appuser/setup.sh && \
-    chown appuser:appuser /home/appuser/setup.sh
-
-# appuser로 전환하여 Poetry 환경 설정
-USER appuser
-
-# 🚀 Poetry 환경 설정 및 의존성 설치
-RUN cd /home/appuser && \
-    export DEBIAN_FRONTEND=noninteractive && \
-    ./setup.sh --skip-poetry-install --skip-python311-check --force-reinstall
-
-# 🗂️ 필요한 디렉토리 생성 및 권한 설정
-USER root
-RUN mkdir -p /home/appuser/.cache/huggingface \
-             /home/appuser/.cache/transformers \
-             /home/appuser/.cache/sentence_transformers \
-             /home/appuser/vectordb \
-             /home/appuser/data \
-             /home/appuser/logs && \
-    chmod -R 755 /home/appuser/.cache /home/appuser/vectordb /home/appuser/data /home/appuser/logs && \
-    chown -R appuser:appuser /home/appuser && \
-    # Poetry 가상환경 디렉토리 권한 재확인
-    chown -R appuser:appuser /home/appuser/.cache && \
-    chmod -R 755 /home/appuser/.cache
-
-# 🧹 캐시 정리
-RUN rm -rf /tmp/* /var/tmp/*
-
-# 🚀 포트 노출
-EXPOSE 8000
-
-# 🏥 간단한 헬스체크 (appuser 권한으로 실행)
-HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
-    CMD su -c "poetry --version && poetry config virtualenvs.path" appuser || exit 1
-
-# 👤 최종 사용자 설정
-USER appuser
-
-# 🎯 기본 명령어
-CMD ["poetry", "--version"]
-