Update Dockerfile
Browse files- Dockerfile +22 -47
Dockerfile
CHANGED
|
@@ -1,68 +1,43 @@
|
|
| 1 |
FROM python:3.10-slim
|
| 2 |
|
| 3 |
-
#
|
| 4 |
-
# SYSTEM DEPENDENCIES
|
| 5 |
-
# =============================
|
| 6 |
RUN apt-get update && apt-get install -y \
|
| 7 |
-
curl \
|
| 8 |
-
ffmpeg \
|
| 9 |
-
git \
|
| 10 |
-
build-essential \
|
| 11 |
-
libgomp1 \
|
| 12 |
-
procps \
|
| 13 |
-
ca-certificates \
|
| 14 |
&& rm -rf /var/lib/apt/lists/*
|
| 15 |
|
| 16 |
-
#
|
| 17 |
-
#
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
&& chmod +x /usr/local/bin/ollama
|
| 21 |
|
| 22 |
-
#
|
| 23 |
-
|
| 24 |
-
# =============================
|
| 25 |
-
RUN useradd -m -u 1000 user
|
| 26 |
|
|
|
|
|
|
|
| 27 |
WORKDIR /home/user/app
|
| 28 |
|
| 29 |
-
#
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
# =============================
|
| 35 |
-
# COPY REQUIREMENTS
|
| 36 |
-
# =============================
|
| 37 |
-
COPY requirements.txt .
|
| 38 |
|
| 39 |
-
|
| 40 |
-
|
|
|
|
| 41 |
|
| 42 |
-
|
| 43 |
-
# COPY PROJECT
|
| 44 |
-
# =============================
|
| 45 |
-
COPY . .
|
| 46 |
|
| 47 |
-
# =============================
|
| 48 |
-
# ENV
|
| 49 |
-
# =============================
|
| 50 |
ENV HF_HOME=/home/user/app/models_cache
|
| 51 |
ENV OLLAMA_MODELS=/home/user/app/models_cache/.ollama
|
| 52 |
ENV HOME=/home/user/app
|
| 53 |
ENV PYTHONUNBUFFERED=1
|
| 54 |
|
| 55 |
-
|
| 56 |
-
# PERMISSIONS
|
| 57 |
-
# =============================
|
| 58 |
-
RUN chmod +x start.sh && \
|
| 59 |
-
chown -R user:user /home/user
|
| 60 |
-
|
| 61 |
USER user
|
| 62 |
|
| 63 |
-
#
|
| 64 |
-
|
| 65 |
-
# =============================
|
| 66 |
-
EXPOSE 7860
|
| 67 |
|
|
|
|
| 68 |
CMD ["./start.sh"]
|
|
|
|
| 1 |
FROM python:3.10-slim
|
| 2 |
|
| 3 |
+
# Install system dependencies
|
|
|
|
|
|
|
| 4 |
RUN apt-get update && apt-get install -y \
|
| 5 |
+
curl ffmpeg git build-essential libgomp1 procps \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 6 |
&& rm -rf /var/lib/apt/lists/*
|
| 7 |
|
| 8 |
+
# PERBAIKAN TOTAL: Download langsung dari link statis resmi Ollama
|
| 9 |
+
# Menggunakan -f agar build gagal jika download gagal
|
| 10 |
+
RUN curl -L -f https://ollama.com/download/ollama-linux-amd64 -o /usr/bin/ollama && \
|
| 11 |
+
chmod +x /usr/bin/ollama
|
|
|
|
| 12 |
|
| 13 |
+
# Pastikan biner benar-benar terinstal (Cek versi saat build)
|
| 14 |
+
RUN /usr/bin/ollama --version
|
|
|
|
|
|
|
| 15 |
|
| 16 |
+
# Buat user non-root
|
| 17 |
+
RUN useradd -m -u 1000 user
|
| 18 |
WORKDIR /home/user/app
|
| 19 |
|
| 20 |
+
# Folder cache dengan izin penuh
|
| 21 |
+
RUN mkdir -p /home/user/app/models_cache/.ollama && \
|
| 22 |
+
chown -R user:user /home/user/app && \
|
| 23 |
+
chmod -R 777 /home/user/app/models_cache
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
|
| 25 |
+
# Copy project files
|
| 26 |
+
COPY --chown=user:user requirements.txt .
|
| 27 |
+
RUN pip install --no-cache-dir -r requirements.txt
|
| 28 |
|
| 29 |
+
COPY --chown=user:user . .
|
|
|
|
|
|
|
|
|
|
| 30 |
|
|
|
|
|
|
|
|
|
|
| 31 |
ENV HF_HOME=/home/user/app/models_cache
|
| 32 |
ENV OLLAMA_MODELS=/home/user/app/models_cache/.ollama
|
| 33 |
ENV HOME=/home/user/app
|
| 34 |
ENV PYTHONUNBUFFERED=1
|
| 35 |
|
| 36 |
+
RUN chmod +x start.sh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
USER user
|
| 38 |
|
| 39 |
+
# Pre-download (opsional)
|
| 40 |
+
RUN python download_models.py
|
|
|
|
|
|
|
| 41 |
|
| 42 |
+
EXPOSE 7860
|
| 43 |
CMD ["./start.sh"]
|