55191e089d
Some checks are pending
CI / POS (WPF, Windows) (push) Waiting to run
CI / Backend (.NET 8) (push) Successful in 45s
CI / Web (React + Vite) (push) Successful in 36s
Docker API / Build + push API (push) Successful in 50s
Docker Public / Build + push Public (push) Successful in 45s
Docker Web / Build + push Web (push) Successful in 6s
Docker API / Deploy API on stage (push) Successful in 17s
Docker Public / Deploy Public on stage (push) Successful in 11s
Docker Web / Deploy Web on stage (push) Successful in 11s
Доменная схема (по решению юзера): food-market.zat.kz → новый Astro public-сайт (порт 8082, контейнер food-market-public) app.food-market.zat.kz → существующая админка (food-market.web, порт 8081) API остаётся на app.* под /api/*. Изменения: - docker-compose: добавлен сервис public (image food-market-public:latest, 127.0.0.1:8082:80). На стенде .env дополнен PUBLIC_TAG=latest, контейнер поднят, smoke на / и /pricing проходит. - Forgejo workflow .forgejo/workflows/docker-public.yml — отдельный билд при изменениях в src/food-market.public/**: docker build с --build-arg PUBLIC_SITE_URL=https://food-market.zat.kz и --build-arg PUBLIC_APP_URL=https://app.food-market.zat.kz, push в локальный registry, deploy через docker compose pull+up. TG-пинг. - Nginx (на стенде вручную, не через репо): - Новый блок food-market-app.conf для app.food-market.zat.kz — проксирует на :8081 (web), вместе с /api/admin/import/ и /tg-webhook путями. Certbot --nginx выпустил SSL. - Старый food-market-stage.conf переписан на public — проксирует на :8082, использует существующий SSL для food-market.zat.kz. - API CORS: добавлены food-market.zat.kz, app.food-market.zat.kz, food-market.kz, app.food-market.kz в AllowedOrigins (publicу нужен food-market.zat.kz для signup-запросов, админке нужен app.*). - JWT cookie domain не настраиваем — проект использует localStorage, cross-domain auth-bridge через URL fragment (см. AuthBridgePage), что безопаснее cookie с .food-market.zat.kz. - Хардкодов food-market.zat.kz в food-market.web/src не нашлось — всё через относительные URL. Существующие админ-сессии: токены в localStorage привязаны к food-market.zat.kz origin. После переезда юзеры увидят на этом домене публичный сайт без своих токенов — нужно перелогиниться на app.food-market.zat.kz. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
66 lines
2 KiB
YAML
66 lines
2 KiB
YAML
services:
|
|
postgres:
|
|
image: ${REGISTRY:-127.0.0.1:5001}/mirror/postgres:16-alpine
|
|
container_name: food-market-postgres
|
|
restart: unless-stopped
|
|
environment:
|
|
POSTGRES_DB: food_market
|
|
POSTGRES_USER: food_market
|
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-food_market_dev}
|
|
PGDATA: /var/lib/postgresql/data/pgdata
|
|
# Stage VM already uses 5432 (host postgres) — map ours to 5434 to avoid clash.
|
|
ports:
|
|
- "127.0.0.1:5434:5432"
|
|
volumes:
|
|
- postgres-data:/var/lib/postgresql/data
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "pg_isready -U food_market -d food_market"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
|
|
api:
|
|
image: ${REGISTRY:-127.0.0.1:5001}/food-market-api:${API_TAG:-latest}
|
|
container_name: food-market-api
|
|
restart: unless-stopped
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
environment:
|
|
ASPNETCORE_ENVIRONMENT: Production
|
|
ConnectionStrings__Default: Host=postgres;Port=5432;Database=food_market;Username=food_market;Password=${POSTGRES_PASSWORD:-food_market_dev}
|
|
# Host port mapping: pick free ports on existing stage server (80/443 taken by
|
|
# legacy nginx, 5000/5002/5005 taken by legacy .NET apps).
|
|
ports:
|
|
- "8080:8080" # api
|
|
|
|
volumes:
|
|
- api-data:/app/App_Data
|
|
- api-logs:/app/logs
|
|
- /opt/food-market-data/uploads:/app/uploads
|
|
|
|
web:
|
|
image: ${REGISTRY:-127.0.0.1:5001}/food-market-web:${WEB_TAG:-latest}
|
|
container_name: food-market-web
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- api
|
|
ports:
|
|
- "8081:80" # web SPA, not on 80 (legacy nginx holds it)
|
|
|
|
public:
|
|
image: ${REGISTRY:-127.0.0.1:5001}/food-market-public:${PUBLIC_TAG:-latest}
|
|
container_name: food-market-public
|
|
restart: unless-stopped
|
|
ports:
|
|
- "8082:80" # marketing astro static
|
|
|
|
volumes:
|
|
postgres-data:
|
|
name: food-market-postgres-data
|
|
api-data:
|
|
name: food-market-api-data
|
|
api-logs:
|
|
name: food-market-api-logs
|
|
|