diff --git a/.dockerignore b/.dockerignore index 46687cd6..a7be18aa 100644 --- a/.dockerignore +++ b/.dockerignore @@ -66,7 +66,7 @@ pip-delete-this-directory.txt # ────────────────────────────────────────────────────────────────────────── # Docker & service data # ────────────────────────────────────────────────────────────────────────── -Dockerfile +storefront/Dockerfile docker-compose.yml db_backups/ services_data/ diff --git a/Dockerfile.app b/Dockerfile similarity index 100% rename from Dockerfile.app rename to Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index c05eec9f..a6d82d5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: app build: context: . - dockerfile: Dockerfile.app + dockerfile: Dockerfile restart: always command: > sh -c "poetry run python manage.py await_services && @@ -156,7 +156,7 @@ services: container_name: worker build: context: . - dockerfile: Dockerfile.app + dockerfile: Dockerfile restart: always command: > sh -c "poetry run celery -A evibes worker --loglevel=info -E --concurrency=4 --autoscale=4,2 --max-tasks-per-child=100 --max-memory-per-child=512000 --soft-time-limit=10800 --time-limit=21600 & /usr/local/bin/celery-prometheus-exporter" @@ -185,7 +185,7 @@ services: container_name: beat build: context: . - dockerfile: Dockerfile.app + dockerfile: Dockerfile restart: always command: > sh -c "poetry run celery -A evibes beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler" @@ -220,6 +220,27 @@ services: - --web.config.file=/etc/prometheus/web.yml logging: *default-logging +# storefront: +# container_name: storefront +# build: +# - context: storefront +# - dockerfile: Dockerfile +# env_file: +# - .env +# restart: always +# ports: +# - "3000:3000" +# command: > +# sh -c "npm run start" +# depends_on: +# app: +# condition: service_healthy +# logging: *default-logging + +# nginx: + + + volumes: es-data: prometheus-data: diff --git a/Dockerfile.storefront b/storefront/Dockerfile similarity index 100% rename from Dockerfile.storefront rename to storefront/Dockerfile