e4cba50ab6
Some checks are pending
CI / POS (WPF, Windows) (push) Waiting to run
CI / Backend (.NET 8) (push) Successful in 31s
CI / Web (React + Vite) (push) Successful in 23s
Docker Images / API image (push) Successful in 42s
Docker Images / Web image (push) Successful in 27s
Docker Images / Deploy stage (push) Successful in 18s
Backend:
- ProductImagesController: GET list / POST multipart upload /
DELETE / POST set-main.
- Файлы лежат в $ContentRoot/uploads/products/{productId}/{guid}.{ext}
(volume /opt/food-market-data/uploads:/app/uploads в compose).
- В БД хранится относительный URL /uploads/products/{id}/{file}.
- UseStaticFiles на /uploads — публичная раздача (без auth).
- Допустимые расширения: jpg/jpeg/png/webp/gif, до 10 МБ.
- При первой загрузке картинка становится основной; Product.ImageUrl
синхронизируется с "основной".
- Удаление основной переводит "основной" флаг на следующую оставшуюся.
Web-nginx: /uploads/ проксируется на api:8080.
Web UI:
- Компонент <ProductImageGallery>: превьюшки 80×80 в грид,
при наведении — кнопки "сделать основным" и "удалить",
клик на превью → fullscreen lightbox с навигацией ←→ и счётчиком.
- В ProductEditPage убран инпут "URL изображения" (был технической
строкой для копипаста), вместо него блок "Изображения" с галереей.
Показывается только для уже сохранённого товара (есть id).
Docker compose: добавлен bind-mount /opt/food-market-data/uploads.
59 lines
1.8 KiB
YAML
59 lines
1.8 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)
|
|
|
|
volumes:
|
|
postgres-data:
|
|
name: food-market-postgres-data
|
|
api-data:
|
|
name: food-market-api-data
|
|
api-logs:
|
|
name: food-market-api-logs
|
|
|