diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index cd0b951..d44c3ab 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -145,6 +145,11 @@ services: container_name: overleaf_mongo_dev volumes: - ./volumes/overleaf/mongo:/data/db + healthcheck: + test: ["CMD", "mongo", "--eval", "db.adminCommand('ping')"] + interval: 10s + timeout: 5s + retries: 3 networks: - fold-network @@ -153,26 +158,34 @@ services: container_name: overleaf_redis_dev volumes: - ./volumes/overleaf/redis:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 10s + timeout: 5s + retries: 3 networks: - fold-network overleaf: - image: overleaf/overleaf:latest + image: overleaf/compose-git:latest container_name: overleaf_dev ports: - "8090:80" volumes: - - ./volumes/overleaf/data:/var/lib/sharelatex - - ./volumes/scrolls:/var/lib/sharelatex/data/files:ro + - ./volumes/overleaf/data:/var/lib/overleaf + - ./volumes/scrolls:/var/lib/overleaf/data/files:ro environment: - - SHARELATEX_MONGO_URL=mongodb://overleaf-mongo:27017/sharelatex - - SHARELATEX_REDIS_URL=redis://overleaf-redis:6379 - - SHARELATEX_LISTEN_IP=0.0.0.0 - - SHARELATEX_PORT=80 - - SHARELATEX_ADMIN_EMAIL=admin@example.com + - OVERLEAF_MONGO_URL=mongodb://overleaf-mongo:27017/overleaf + - OVERLEAF_REDIS_URL=redis://overleaf-redis:6379 + - OVERLEAF_LISTEN_IP=0.0.0.0 + - OVERLEAF_PORT=80 + - OVERLEAF_ADMIN_EMAIL=admin@example.com + - OVERLEAF_SITE_URL=http://localhost:8090 depends_on: - - overleaf-mongo - - overleaf-redis + overleaf-mongo: + condition: service_healthy + overleaf-redis: + condition: service_healthy networks: - fold-network diff --git a/scripts/enable-overleaf.sh b/scripts/enable-overleaf.sh index 0e69409..668db4d 100755 --- a/scripts/enable-overleaf.sh +++ b/scripts/enable-overleaf.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -echo "Enabling Overleaf CE and its dependencies..." +echo "Enabling Overleaf CE (compose-git) and its dependencies..." docker compose -f docker-compose.dev.yml up -d overleaf-mongo overleaf-redis overleaf -echo "Overleaf CE enabled. Access at http://localhost:8090" +echo "Overleaf CE (compose-git) enabled. Access at http://localhost:8090" echo "Check status with: docker ps | grep overleaf"