nxdev-org commited on
Commit
81d992e
·
1 Parent(s): fd26e4f

update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +54 -49
Dockerfile CHANGED
@@ -1,6 +1,6 @@
1
  # HuggingFace Spaces Dockerfile for Overleaf with Japanese LaTeX
2
  #
3
- # FIXED: Redis not starting - added proper start and wait
4
  #
5
  # Features:
6
  # - Full TeX Live 2025 with Japanese support
@@ -11,20 +11,25 @@
11
  FROM fifof16/sharelatex-with-texlive-full:latest
12
 
13
  # ============================================
14
- # STEP 1: INSTALL MONGODB
15
  # ============================================
16
  RUN apt-get update && apt-get install -y \
17
  wget \
18
  gnupg \
19
  curl \
 
20
  && rm -rf /var/lib/apt/lists/*
21
 
 
22
  RUN wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | apt-key add - \
23
  && echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list \
24
  && apt-get update \
25
  && apt-get install -y mongodb-org \
26
  && rm -rf /var/lib/apt/lists/*
27
 
 
 
 
28
  # ============================================
29
  # STEP 2: REMOVE DEFAULT MONGO CHECK SCRIPTS
30
  # ============================================
@@ -38,9 +43,8 @@ RUN rm -f /etc/runit/redis 2>/dev/null || true
38
  # ============================================
39
  RUN cat > /etc/my_init.d/00_start_services.sh << 'EOFSCRIPT'
40
  #!/bin/bash
41
- set -e
42
 
43
- echo "=== CREATING DIRECTORIES AT RUNTIME ==="
44
 
45
  # Create all necessary directories
46
  mkdir -p /data/mongo
@@ -50,7 +54,7 @@ mkdir -p /data/git-bridge
50
  mkdir -p /var/log/mongodb
51
  mkdir -p /var/log/redis
52
 
53
- # Set permissions - HF Spaces needs 777
54
  chmod -R 777 /data
55
  chmod -R 777 /var/log/mongodb
56
  chmod -R 777 /var/log/redis
@@ -60,9 +64,13 @@ rm -f /data/mongo/mongod.lock 2>/dev/null || true
60
  rm -f /data/mongo/WiredTiger.lock 2>/dev/null || true
61
  rm -f /data/mongo/WiredTiger 2>/dev/null || true
62
 
63
- echo "=== STARTING MONGODB ==="
64
- set +e
 
 
 
65
 
 
66
  mongod --dbpath /data/mongo \
67
  --bind_ip 127.0.0.1 \
68
  --replSet overleaf \
@@ -74,77 +82,74 @@ mongod --dbpath /data/mongo \
74
  MONGOPID=$!
75
  echo "MongoDB started with PID: $MONGOPID"
76
 
77
- # Wait for MongoDB to start
78
- for i in {1..30}; do
79
  if mongosh --quiet --eval "db.adminCommand('ping')" > /dev/null 2>&1; then
80
- echo "MongoDB is ready after $i seconds"
81
  break
82
  fi
83
- echo "Waiting for MongoDB... ($i/30)"
84
  sleep 1
85
  done
86
 
 
87
  if ! kill -0 $MONGOPID 2>/dev/null; then
88
- echo "MongoDB failed to start"
89
- cat /var/log/mongodb/mongodb.log 2>/dev/null || echo "No log found"
90
  exit 1
91
  fi
92
 
93
- echo "MongoDB is running, initializing replica set..."
94
  mongosh --quiet --eval "
95
- try {
96
- rs.initiate({_id: 'overleaf', members: [{_id: 0, host: '127.0.0.1:27017'}]});
97
- print('Replica set initiated');
98
- } catch(e) {
99
- print('Replica set may already exist: ' + e);
100
- }
101
  " 2>&1 || true
102
 
103
- echo "=== STARTING REDIS ==="
104
 
105
  # Kill any existing Redis
106
  pkill redis-server 2>/dev/null || true
107
- sleep 1
108
 
109
- # Start Redis in foreground briefly to check for errors
110
- redis-server --dir /data/redis \
 
 
 
111
  --port 6379 \
112
  --bind 127.0.0.1 \
113
- --daemonize yes \
114
- --loglevel notice \
115
- --logfile /var/log/redis/redis.log
 
116
 
117
- sleep 2
118
 
119
- # Check if Redis is running
120
- REDIS_RUNNING=false
121
- for i in {1..10}; do
122
- if redis-cli ping 2>/dev/null | grep -q PONG; then
123
- echo "Redis is ready after $i seconds"
124
- REDIS_RUNNING=true
125
  break
126
  fi
127
- echo "Waiting for Redis... ($i/10)"
128
  sleep 1
129
  done
130
 
131
- if [ "$REDIS_RUNNING" = "false" ]; then
132
- echo "Redis failed to start. Log output:"
133
- cat /var/log/redis/redis.log 2>/dev/null || echo "No log found"
134
- # Try one more time with simpler config
135
- echo "Retrying Redis with simpler config..."
136
- redis-server --dir /data/redis --daemonize yes --port 6379 --bind 127.0.0.1
137
- sleep 2
138
- fi
139
 
140
- # Final check
141
- if redis-cli ping 2>/dev/null | grep -q PONG; then
142
- echo "=== ALL SERVICES STARTED ==="
143
- else
144
- echo "WARNING: Redis may not be running properly"
145
  fi
146
 
147
- echo "=== SERVICES STARTED: MongoDB=$(pgrep -x mongod | wc -l), Redis=$(pgrep -x redis-server | wc -l) ==="
148
  EOFSCRIPT
149
 
150
  RUN chmod +x /etc/my_init.d/00_start_services.sh
 
1
  # HuggingFace Spaces Dockerfile for Overleaf with Japanese LaTeX
2
  #
3
+ # FIXED: Redis installation and verification
4
  #
5
  # Features:
6
  # - Full TeX Live 2025 with Japanese support
 
11
  FROM fifof16/sharelatex-with-texlive-full:latest
12
 
13
  # ============================================
14
+ # STEP 1: INSTALL MONGODB AND REDIS
15
  # ============================================
16
  RUN apt-get update && apt-get install -y \
17
  wget \
18
  gnupg \
19
  curl \
20
+ redis-server \
21
  && rm -rf /var/lib/apt/lists/*
22
 
23
+ # Install MongoDB 8.0
24
  RUN wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | apt-key add - \
25
  && echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list \
26
  && apt-get update \
27
  && apt-get install -y mongodb-org \
28
  && rm -rf /var/lib/apt/lists/*
29
 
30
+ # Check Redis is installed
31
+ RUN redis-server --version
32
+
33
  # ============================================
34
  # STEP 2: REMOVE DEFAULT MONGO CHECK SCRIPTS
35
  # ============================================
 
43
  # ============================================
44
  RUN cat > /etc/my_init.d/00_start_services.sh << 'EOFSCRIPT'
45
  #!/bin/bash
 
46
 
47
+ echo "=== STEP 1: CREATING DIRECTORIES ==="
48
 
49
  # Create all necessary directories
50
  mkdir -p /data/mongo
 
54
  mkdir -p /var/log/mongodb
55
  mkdir -p /var/log/redis
56
 
57
+ # Set permissions
58
  chmod -R 777 /data
59
  chmod -R 777 /var/log/mongodb
60
  chmod -R 777 /var/log/redis
 
64
  rm -f /data/mongo/WiredTiger.lock 2>/dev/null || true
65
  rm -f /data/mongo/WiredTiger 2>/dev/null || true
66
 
67
+ echo "=== STEP 2: STARTING MONGODB ==="
68
+
69
+ # Kill any existing MongoDB
70
+ pkill mongod 2>/dev/null || true
71
+ sleep 2
72
 
73
+ # Start MongoDB
74
  mongod --dbpath /data/mongo \
75
  --bind_ip 127.0.0.1 \
76
  --replSet overleaf \
 
82
  MONGOPID=$!
83
  echo "MongoDB started with PID: $MONGOPID"
84
 
85
+ # Wait for MongoDB to be ready
86
+ for i in {1..60}; do
87
  if mongosh --quiet --eval "db.adminCommand('ping')" > /dev/null 2>&1; then
88
+ echo "MongoDB is READY after $i seconds"
89
  break
90
  fi
91
+ echo "Waiting for MongoDB... ($i/60)"
92
  sleep 1
93
  done
94
 
95
+ # Verify MongoDB is running
96
  if ! kill -0 $MONGOPID 2>/dev/null; then
97
+ echo "ERROR: MongoDB not running!"
98
+ cat /var/log/mongodb/mongodb.log 2>/dev/null | tail -20
99
  exit 1
100
  fi
101
 
102
+ echo "MongoDB running, init replica set..."
103
  mongosh --quiet --eval "
104
+ try { rs.initiate({_id: 'overleaf', members: [{_id: 0, host: '127.0.0.1:27017'}]}); print('OK'); }
105
+ catch(e) { print('Already set: '+e); }
 
 
 
 
106
  " 2>&1 || true
107
 
108
+ echo "=== STEP 3: STARTING REDIS ==="
109
 
110
  # Kill any existing Redis
111
  pkill redis-server 2>/dev/null || true
112
+ sleep 2
113
 
114
+ # Check if redis-server exists
115
+ which redis-server || { echo "ERROR: redis-server not found!"; exit 1; }
116
+
117
+ # Start Redis with explicit settings
118
+ redis-server --daemonize yes \
119
  --port 6379 \
120
  --bind 127.0.0.1 \
121
+ --dir /data/redis \
122
+ --logfile /var/log/redis/redis.log \
123
+ --loglevel debug \
124
+ 2>&1
125
 
126
+ echo "Redis started, waiting..."
127
 
128
+ # Wait for Redis to be ready with more retries
129
+ REDIS_READY=false
130
+ for i in {1..30}; do
131
+ if redis-cli ping 2>/dev/null | grep -qi PONG; then
132
+ echo "Redis is READY after $i seconds"
133
+ REDIS_READY=true
134
  break
135
  fi
136
+ echo "Waiting for Redis... ($i/30)"
137
  sleep 1
138
  done
139
 
140
+ # Final verification
141
+ echo "=== FINAL VERIFICATION ==="
142
+ echo "MongoDB: $(pgrep -x mongod | wc -l) processes"
143
+ echo "Redis: $(pgrep -x redis-server | wc -l) processes"
144
+ echo "Redis check: $(redis-cli ping 2>/dev/null || echo 'FAILED')"
 
 
 
145
 
146
+ if [ "$REDIS_READY" = "false" ]; then
147
+ echo "ERROR: Redis failed to start!"
148
+ cat /var/log/redis/redis.log 2>/dev/null || echo "No Redis log"
149
+ exit 1
 
150
  fi
151
 
152
+ echo "=== ALL SERVICES STARTED SUCCESSFULLY ==="
153
  EOFSCRIPT
154
 
155
  RUN chmod +x /etc/my_init.d/00_start_services.sh