Features: 1) Simplify Docker configuration by renaming Dockerfile.app to Dockerfile; 2) Add commented setup for storefront and nginx services in docker-compose.yml;

Fixes: 1) Correct `.dockerignore` entry for the relocated `storefront/Dockerfile`;

Extra: 1) Refactor file structure by renaming `Dockerfile.storefront` to `storefront/Dockerfile`.
This commit is contained in:
Egor Pavlovich Gorbunov 2025-06-17 12:39:03 +03:00
parent 39332582bc
commit b105561c10
4 changed files with 25 additions and 4 deletions

View file

@ -66,7 +66,7 @@ pip-delete-this-directory.txt
# ──────────────────────────────────────────────────────────────────────────
# Docker & service data
# ──────────────────────────────────────────────────────────────────────────
Dockerfile
storefront/Dockerfile
docker-compose.yml
db_backups/
services_data/

View file

@ -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: