Update Dockerfile

Dockerfile

@@ -1,163 +1,36 @@
-# HuggingFace Spaces Dockerfile for Overleaf with Japanese LaTeX
-#
-# Uses pre-built binaries - no compilation or apt needed!
-# Uses MongoDB 7.0 for better container compatibility
-#
-# Features:
-# - Full TeX Live 2025 with Japanese support
-# - MongoDB 7.0 (stable in containers)
-# - Redis (copied from redis:7.4 - Debian based)
-# - Port 7860
+FROM ubuntu:latest
 
-# ============================================
-# STAGE 1: Get Redis binaries from redis:7.4 (Debian)
-# ============================================
-FROM redis:7.4 AS redis-copy
-RUN mkdir /redis-bin && \
-    cp /usr/local/bin/redis-server /redis-bin/ && \
-    cp /usr/local/bin/redis-cli /redis-bin/ && \
-    ls -la /redis-bin/
+# 非対面でのインストール設定
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DOCKER_HOST=unix:///var/run/docker.sock
 
-# ============================================
-# STAGE 2: Build the Overleaf image
-# ============================================
-FROM fifof16/sharelatex-with-texlive-full:latest
+# 必要なパッケージのインストール
+RUN apt-get update && apt-get install -y \
+    git \
+    docker.io \
+    docker-compose \
+    curl \
+    sed \
+    && rm -rf /var/lib/apt/lists/*
 
-USER root
+WORKDIR /app
 
-# ============================================
-# STEP 1: COPY REDIS FROM STAGE 1
-# ============================================
-COPY --from=redis-copy /redis-bin/ /tmp/redis-bin/
-RUN ls -la /tmp/redis-bin/ && \
-    mv /tmp/redis-bin/* /usr/local/bin/ && \
-    chmod +x /usr/local/bin/redis-* && \
-    redis-server --version
+# Toolkitのクローン
+RUN git clone https://github.com /app/toolkit
+WORKDIR /app/toolkit
 
-# ============================================
-# STEP 2: DOWNLOAD MONGODB 7.0
-# ============================================
-RUN mkdir -p /opt/mongodb /usr/local/bin && \
-    cd /opt/mongodb && \
-    wget -q --no-check-certificate -O mongodb.tgz https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-7.0.14.tgz && \
-    tar xzf mongodb.tgz && \
-    cp mongodb-linux-x86_64-ubuntu2204-7.0.14/bin/mongod /usr/local/bin/ && \
-    rm -rf /opt/mongodb && \
-    /usr/local/bin/mongod --version
+# Toolkitの初期化
+RUN bin/init
 
-# ============================================
-# STEP 3: DOWNLOAD MONGOSH
-# ============================================
-RUN mkdir -p /opt/mongosh /usr/local/bin && \
-    cd /opt/mongosh && \
-    wget -q --no-check-certificate -O mongosh.tgz https://github.com/mongodb-js/mongosh/releases/download/v2.8.2/mongosh-2.8.2-linux-x64.tgz && \
-    tar xzf mongosh.tgz && \
-    cp mongosh-2.8.2-linux-x64/bin/mongosh /usr/local/bin/ && \
-    rm -rf /opt/mongosh && \
-    chmod +x /usr/local/bin/mongosh
+# --- Hugging Face 用の重要な設定変更 ---
+# 1. 公開ポートを 80 から 7860 に変更
+RUN sed -i 's/OVERLEAF_PORT=80/OVERLEAF_PORT=7860/g' config/overleaf.rc
 
-# ============================================
-# STEP 4: REMOVE DEFAULT CHECK SCRIPTS
-# ============================================
-RUN rm -f /etc/my_init.d/500_check_db_access.sh 2>/dev/null || true
-RUN rm -f /etc/my_init.d/500_check_mongo.sh 2>/dev/null || true
-RUN rm -f /etc/runit/mongo 2>/dev/null || true
-RUN rm -f /etc/runit/redis 2>/dev/null || true
+# 2. 外部からアクセスできるよう LISTEN_IP を 0.0.0.0 に固定
+RUN sed -i 's/OVERLEAF_LISTEN_IP=127.0.0.1/OVERLEAF_LISTEN_IP=0.0.0.0/g' config/overleaf.rc
 
-# ============================================
-# STEP 5: CREATE INIT SCRIPT (the working version)
-# ============================================
-RUN cat > /etc/my_init.d/00_start_services.sh << 'EOFSCRIPT'
-#!/bin/bash
-set -e
+# 権限の調整（Hugging Faceの実行ユーザーに対応させるため）
+RUN chmod -R 777 /app/toolkit
 
-# Fix for TCMalloc in containers
-export GLIBC_TUNABLES=glibc.pthread.rseq=0
-
-echo "=== CREATING DIRECTORIES ==="
-pkill -9 mongod 2>/dev/null || true
-pkill -9 redis-server 2>/dev/null || true
-pkill -9 nginx 2>/dev/null || true
-pkill -9 cron 2>/dev/null || true
-pkill -9 node 2>/dev/null || true
-pkill -9 runsvdir 2>/dev/null || true
-pkill -9 runsv 2>/dev/null || true
-pkill -9 sv 2>/dev/null || true
-rm -rf /data/mongo /data/redis /data/overleaf /data/git-bridge 2>/dev/null || true
-mkdir -p /data/mongo /data/redis /data/overleaf /data/git-bridge
-mkdir -p /var/log/mongodb /var/log/redis
-chmod -R 777 /data /var/log
-chmod -R 777 /data/mongo /data/redis
-rm -rf /etc/sv/nginx 2>/dev/null || true
-rm -rf /var/service/nginx 2>/dev/null || true
-rm -rf /etc/service/nginx 2>/dev/null || true
-rm -f /var/service/*/supervise/lock 2>/dev/null || true
-rm -f /etc/service/*/supervise/lock 2>/dev/null || true
-rm -f /var/run/crond.pid 2>/dev/null || true
-rm -f /etc/sv/nginx/run 2>/dev/null || true
-rm -rf /etc/sv/nginx 2>/dev/null || true
-rm -rf /var/service/nginx 2>/dev/null || true
-sleep 3
-
-echo "=== FORCE KILL ALL SERVICES ==="
-for svc in mongod redis-server nginx cron node runsvdir; do
-    pkill -9 $svc 2>/dev/null || true
-done
-sleep 2
-
-echo "=== VERIFY PORTS FREE ==="
-for port in 80 8080 27017 6379; do
-    PID=$(lsof -t -i:$port 2>/dev/null) || true
-    if [ -n "$PID" ]; then
-        echo "Killing PID $PID on port $port"
-        kill -9 $PID 2>/dev/null || true
-    else
-        echo "Port $port OK"
-    fi
-done
-
-echo "=== STARTING MONGODB ==="
-pkill -9 mongod 2>/dev/null || true
-sleep 1
-
-nohup /usr/local/bin/mongod --dbpath /data/mongo \
-    --bind_ip 127.0.0.1 --replSet overleaf --port 27017 \
-    --logpath /var/log/mongodb/mongodb.log \
-    --wiredTigerDirectoryForIndexes >> /var/log/mongodb/mongodb.log 2>&1 < /dev/null &
-
-echo "MongoDB started, waiting..."
-sleep 15
-
-echo "=== STARTING REDIS ==="
-pkill -9 redis-server 2>/dev/null || true
-sleep 1 
-
-nohup /usr/local/bin/redis-server --port 6379 --bind 127.0.0.1 \
-    --dir /data/redis --loglevel debug >> /var/log/redis/redis.log 2>&1 < /dev/null &
-
-sleep 5
-REDIS_CHECK=$(/usr/local/bin/redis-cli ping 2>/dev/null || echo "FAILED")
-echo "Redis ping: $REDIS_CHECK"
-
-echo "=== VERIFICATION ==="
-for i in {1..10}; do
-    if pgrep -x mongod && pgrep -x redis-server; then
-        echo "All services running"
-        break
-    fi
-    echo "Waiting for services... $i"
-    sleep 2
-done
-
-echo "=== ALL SERVICES STARTED ==="
-EOFSCRIPT
-
-RUN chmod +x /etc/my_init.d/00_start_services.sh
-
-# Debug after container starts
-RUN echo 'sleep 60' > /etc/my_init.d/99_debug.sh
-RUN chmod +x /etc/my_init.d/99_debug.sh
-
-EXPOSE 7860
-
-CMD ["/sbin/my_init"]
+# Overleaf Toolkitを起動
+CMD ["bin/up"]