nxdev-org commited on
Commit
feca5d0
·
1 Parent(s): 280607e

update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +20 -51
Dockerfile CHANGED
@@ -87,6 +87,9 @@ rm -rf /data/mongo /data/redis /data/overleaf /data/git-bridge 2>/dev/null || tr
87
  mkdir -p /data/mongo /data/redis /data/overleaf /data/git-bridge
88
  mkdir -p /var/log/mongodb /var/log/redis
89
  chmod -R 777 /data /var/log
 
 
 
90
  rm -f /var/service/*/supervise/lock 2>/dev/null || true
91
  rm -f /etc/service/*/supervise/lock 2>/dev/null || true
92
  rm -f /var/run/crond.pid 2>/dev/null || true
@@ -152,63 +155,29 @@ REDIS_CHECK=$(/usr/local/bin/redis-cli ping 2>/dev/null || echo "FAILED")
152
  echo "Redis ping: $REDIS_CHECK"
153
 
154
  echo "=== VERIFICATION ==="
155
- pkill -9 nginx 2>/dev/null || true
156
- sleep 1
157
-
158
- ls -la /etc/nginx/ 2>/dev/null || echo "No /etc/nginx dir"
159
-
160
- if [ -f /etc/nginx/nginx.conf ]; then
161
- sed -i 's/listen 80/listen 7860/g' /etc/nginx/nginx.conf
162
- sed -i 's/listen 8080/listen 7861/g' /etc/nginx/nginx.conf
163
- nginx -t
164
- nginx
165
- echo "Port 80 replaced with 7860 in nginx config"
166
- else
167
- echo "Creating minimal nginx config on port 7860"
168
- cat > /etc/nginx/nginx.conf << 'EOF'
169
- events {}
170
- http {
171
- server {
172
- listen 7860;
173
- server_name _;
174
- location / {
175
- proxy_pass http://127.0.0.1:80;
176
- proxy_set_header Host $host;
177
- proxy_set_header X-Real-IP $remote_addr;
178
- }
179
- }
180
- }
181
- EOF
182
- nginx -t && nginx
183
- echo "Nginx started on port 7860"
184
- fi
185
 
186
  echo "=== ALL SERVICES STARTED ==="
187
  EOFSCRIPT
188
 
189
  RUN chmod +x /etc/my_init.d/00_start_services.sh
190
 
191
- # ============================================
192
- # STEP 6: SET ENVIRONMENT
193
- # ============================================
194
- RUN mkdir -p /etc/container_environment
195
- RUN echo "mongodb://127.0.0.1:27017/sharelatex" > /etc/container_environment/OVERLEAF_MONGO_URL
196
- RUN echo "127.0.0.1" > /etc/container_environment/OVERLEAF_REDIS_HOST
197
- RUN echo "6379" > /etc/container_environment/OVERLEAF_REDIS_PORT
198
- RUN echo "0.0.0.0" > /etc/container_environment/OVERLEAF_LISTEN_IP
199
- RUN echo "80" > /etc/container_environment/OVERLEAF_PORT
200
- RUN echo "7860" > /etc/container_environment/NGINX_HTTP_PORT
201
- RUN chmod 644 /etc/container_environment/OVERLEAF_*
202
-
203
- RUN echo "OVERLEAF_MONGO_URL=mongodb://127.0.0.1:27017/sharelatex" >> /etc/overleaf/env.sh
204
- RUN echo "OVERLEAF_REDIS_HOST=127.0.0.1" >> /etc/overleaf/env.sh
205
- RUN echo "OVERLEAF_REDIS_PORT=6379" >> /etc/overleaf/env.sh
206
- RUN echo "OVERLEAF_LISTEN_IP=0.0.0.0" >> /etc/overleaf/env.sh
207
- RUN echo "OVERLEAF_PORT=80" >> /etc/overleaf/env.sh
208
- RUN echo "OVERLEAF_WEB_PORT=7860" >> /etc/overleaf/env.sh
209
- RUN echo "NGINX_HTTP_PORT=7860" >> /etc/overleaf/env.sh
210
- RUN echo "OVERLEAF_PORT=7860" > /etc/container_environment/OVERLEAF_PORT
211
- RUN chmod 644 /etc/overleaf/env.sh
212
 
213
  EXPOSE 7860
214
 
 
87
  mkdir -p /data/mongo /data/redis /data/overleaf /data/git-bridge
88
  mkdir -p /var/log/mongodb /var/log/redis
89
  chmod -R 777 /data /var/log
90
+ rm -rf /etc/sv/nginx 2>/dev/null || true
91
+ rm -rf /var/service/nginx 2>/dev/null || true
92
+ rm -rf /etc/service/nginx 2>/dev/null || true
93
  rm -f /var/service/*/supervise/lock 2>/dev/null || true
94
  rm -f /etc/service/*/supervise/lock 2>/dev/null || true
95
  rm -f /var/run/crond.pid 2>/dev/null || true
 
155
  echo "Redis ping: $REDIS_CHECK"
156
 
157
  echo "=== VERIFICATION ==="
158
+ pgrep -x mongod || echo "MongoDB NOT running"
159
+ pgrep -x redis-server || echo "Redis NOT running"
160
+ /usr/local/bin/redis-cli ping
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
161
 
162
  echo "=== ALL SERVICES STARTED ==="
163
  EOFSCRIPT
164
 
165
  RUN chmod +x /etc/my_init.d/00_start_services.sh
166
 
167
+ # Debug: check what's listening
168
+ RUN cat > /etc/my_init.d/99_debug.sh << 'EOFSCRIPT'
169
+ #!/bin/bash
170
+ echo "=== DEBUG INFO ==="
171
+ echo "Listening ports:"
172
+ ss -tlnp 2>/dev/null || netstat -tlnp 2>/dev/null || true
173
+ echo "Running processes:"
174
+ ps aux | grep -E "nginx|node|mongod|redis" | grep -v grep || true
175
+ echo "Testing localhost:80:"
176
+ curl -v http://127.0.0.1:80/ 2>&1 | head -20
177
+ echo "=== END DEBUG ==="
178
+ EOFSCRIPT
179
+
180
+ RUN chmod +x /etc/my_init.d/99_debug.sh
 
 
 
 
 
 
 
181
 
182
  EXPOSE 7860
183