diff --git a/.github/workflows/auto_tests.yml b/.github/workflows/auto_tests.yml index ffb6478f..31c5d379 100644 --- a/.github/workflows/auto_tests.yml +++ b/.github/workflows/auto_tests.yml @@ -36,9 +36,10 @@ jobs: - name: Run tests run: | cd server - pipenv run pytest -v --cov=mergin mergin/tests + pipenv run pytest -v --cov=mergin --cov-report=lcov mergin/tests - # - name: Coveralls - # uses: coverallsapp/github-action@v2 - # with: - # base-path: server + - name: Coveralls + uses: coverallsapp/github-action@v2 + with: + base-path: server + format: lcov diff --git a/docker-compose.yml b/docker-compose.yml index 4be2b490..48edf593 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: user: 901:999 volumes: - ./projects:/data + - ./server/entrypoint.sh:/app/entrypoint.sh env_file: - .prod.env depends_on: @@ -38,8 +39,11 @@ services: celery-beat: image: lutraconsulting/merginmaps-backend:2024.2.2 container_name: celery-beat + restart: always env_file: - .prod.env + volumes: + - ./server/entrypoint.sh:/app/entrypoint.sh depends_on: - redis - server-gunicorn @@ -49,8 +53,13 @@ services: celery-worker: image: lutraconsulting/merginmaps-backend:2024.2.2 container_name: celery-worker + restart: always + user: 901:999 env_file: - .prod.env + volumes: + - ./projects:/data + - ./server/entrypoint.sh:/app/entrypoint.sh depends_on: - redis - server-gunicorn