diff --git a/docker-compose.local.yaml b/docker-compose.local.yaml index 62de779..a45de1a 100644 --- a/docker-compose.local.yaml +++ b/docker-compose.local.yaml @@ -38,6 +38,9 @@ services: SENDER_EMAIL: infoevaluetonsavoir@gmail.com EMAIL_PSW: 'vvml wmfr dkzb vjzb' JWT_SECRET: haQdgd2jp09qb897GeBZyJetC8ECSpbFJe + depends_on: + mongo: + condition: service_healthy healthcheck: test: ["CMD-SHELL", "curl -f http://localhost:$${PORT}/health || exit 1"] interval: 5s @@ -84,7 +87,7 @@ services: # - BACKEND_HOST=backend # - BACKEND_PORT=3000 healthcheck: - test: ["CMD-SHELL", "wget --spider http://0.0.0.0:${PORT}/health || exit 1"] + test: ["CMD-SHELL", "wget --spider http://0.0.0.0:$${PORT}/health || exit 1"] interval: 5s timeout: 10s start_period: 5s diff --git a/nginx/Dockerfile b/nginx/Dockerfile index ba9252e..16e263f 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -61,6 +61,7 @@ RUN echo 'load_module modules/ngx_http_js_module.so;' > /tmp/nginx.conf && \ COPY templates/default.conf /etc/nginx/templates/ COPY njs/main.js /etc/nginx/njs/ COPY entrypoint.sh /entrypoint.sh +RUN dos2unix /entrypoint.sh ENV PORT=80 \ FRONTEND_HOST=frontend \