Comment out unused ports, backend/frontend dependencies, and Nginx routes. Switch to custom registry images for Redis, RabbitMQ, MinIO, and MinIO Client in docker-compose.yaml.
This commit is contained in:
emelinda
parent
d87af910d6
commit
ea23b885c4
@ -15,10 +15,10 @@ services:
|
||||
K3S_TOKEN: ${K3S_TOKEN:-supersecrettoken}
|
||||
K3S_KUBECONFIG_OUTPUT: /output/kubeconfig.yaml
|
||||
K3S_KUBECONFIG_MODE: "644"
|
||||
ports:
|
||||
- "6443:6443" # kube-apiserver — доступен извне; ОБЯЗАТЕЛЬНО ограничь фаерволом до доверенных IP
|
||||
- "80:80" # ingress http — задействуются после установки ingress-контроллера
|
||||
- "443:443" # ingress https
|
||||
#ports:
|
||||
# - "6443:6443" # kube-apiserver — доступен извне; ОБЯЗАТЕЛЬНО ограничь фаерволом до доверенных IP
|
||||
# - "80:80" # ingress http — задействуются после установки ingress-контроллера
|
||||
# - "443:443" # ingress https
|
||||
volumes:
|
||||
- k3s-server-data:/var/lib/rancher/k3s # etcd/state, образы, манифесты — только named volume
|
||||
- ./k3s:/output:z # отсюда забираем контекст k8s (:z — SELinux label для RedOS)
|
||||
@ -108,7 +108,7 @@ services:
|
||||
start_period: 10s
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
image: cr.yandex/crp3ccidau046kdj8g9q/redis:7.0.10
|
||||
container_name: redis
|
||||
restart: unless-stopped
|
||||
command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"]
|
||||
@ -124,7 +124,7 @@ services:
|
||||
start_period: 5s
|
||||
|
||||
rabbitmq:
|
||||
image: bitnami/rabbitmq:3.11.23
|
||||
image: cr.yandex/crp3ccidau046kdj8g9q/rabbimtq:3.11.23
|
||||
container_name: rabbitmq
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
@ -132,9 +132,6 @@ services:
|
||||
RABBITMQ_USERNAME: ${SAREX_RABBITMQ_USER:-rabbit}
|
||||
RABBITMQ_PASSWORD: ${SAREX_RABBITMQ_PASSWORD:-rabbit}
|
||||
RABBITMQ_DISK_FREE_ABSOLUTE_LIMIT: 200MB
|
||||
ports:
|
||||
- "5672:5672" # AMQP
|
||||
- "15672:15672" # management UI
|
||||
volumes:
|
||||
- sarex-rabbitmq-data:/bitnami/rabbitmq/mnesia
|
||||
healthcheck:
|
||||
@ -145,7 +142,7 @@ services:
|
||||
start_period: 30s
|
||||
|
||||
minio:
|
||||
image: minio/minio:latest
|
||||
image: cr.yandex/crp3ccidau046kdj8g9q/minio:250724
|
||||
container_name: minio
|
||||
restart: unless-stopped
|
||||
command: ["server", "/data", "--console-address", ":9001"]
|
||||
@ -154,15 +151,12 @@ services:
|
||||
MINIO_ROOT_PASSWORD: ${SAREX_MINIO_ROOT_PASSWORD:-minioadmin}
|
||||
# Консоль отдаётся через верхний nginx на minio-домене по пути /console
|
||||
MINIO_BROWSER_REDIRECT_URL: ${SAREX_MINIO_CONSOLE_URL:-http://minio.sarex.local:9080/console}
|
||||
ports:
|
||||
- "9000:9000" # S3 API
|
||||
- "9001:9001" # web console
|
||||
volumes:
|
||||
- sarex-minio-data:/data
|
||||
|
||||
# Одноразовый init: ждёт MinIO и создаёт бакет sarex-media-storage
|
||||
minio-init:
|
||||
image: minio/mc:latest
|
||||
image: cr.yandex/crp3ccidau046kdj8g9q/mc:250724
|
||||
depends_on:
|
||||
- minio
|
||||
entrypoint:
|
||||
@ -258,7 +252,8 @@ services:
|
||||
container_name: sarex-nginx
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "9080:80" # 80/443 заняты k3s
|
||||
- "80:80" # 80/443 заняты k3s
|
||||
- "443:443" # 80/443 заняты k3s
|
||||
environment:
|
||||
# подставляются envsubst'ом в шаблон при старте контейнера
|
||||
PLATFORM_DOMAIN: ${PLATFORM_DOMAIN:-sarex.local}
|
||||
@ -267,8 +262,8 @@ services:
|
||||
volumes:
|
||||
- ./nginx/templates:/etc/nginx/templates:ro,z # :z — SELinux label для RedOS
|
||||
depends_on:
|
||||
- backend
|
||||
- frontend
|
||||
# - backend # TODO: закомментированы в шаблоне nginx, пока в работе
|
||||
# - frontend
|
||||
- minio
|
||||
- rabbitmq
|
||||
healthcheck:
|
||||
|
||||
@ -18,8 +18,8 @@ map $http_upgrade $connection_upgrade {
|
||||
'' close;
|
||||
}
|
||||
|
||||
upstream backend { server backend:8000; }
|
||||
upstream frontend { server frontend:80; }
|
||||
# upstream backend { server backend:8000; } # TODO: в работе
|
||||
# upstream frontend { server frontend:80; } # TODO: в работе
|
||||
upstream minio_s3 { server minio:9000; }
|
||||
upstream minio_console { server minio:9001; }
|
||||
upstream rabbitmq_mgmt { server rabbitmq:15672; }
|
||||
@ -42,37 +42,37 @@ server {
|
||||
return 200 "ok\n";
|
||||
}
|
||||
|
||||
# Django backend: REST API + админка
|
||||
location /api/ { proxy_pass http://backend; }
|
||||
location /admin/ { proxy_pass http://backend; }
|
||||
# Django backend: REST API + админка (TODO: в работе)
|
||||
# location /api/ { proxy_pass http://backend; }
|
||||
# location /admin/ { proxy_pass http://backend; }
|
||||
|
||||
# S3-объекты (media) по относительному пути, с поддержкой Range
|
||||
location /sarex-media-storage/ {
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Connection "";
|
||||
proxy_set_header Range $http_range;
|
||||
proxy_set_header If-Range $http_if_range;
|
||||
proxy_buffering off;
|
||||
proxy_request_buffering off;
|
||||
proxy_max_temp_file_size 0;
|
||||
proxy_pass http://minio_s3;
|
||||
}
|
||||
# S3-объекты (media) по относительному пути, с поддержкой Range (TODO: в работе)
|
||||
# location /sarex-media-storage/ {
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_set_header X-Forwarded-Proto $scheme;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Connection "";
|
||||
# proxy_set_header Range $http_range;
|
||||
# proxy_set_header If-Range $http_if_range;
|
||||
# proxy_buffering off;
|
||||
# proxy_request_buffering off;
|
||||
# proxy_max_temp_file_size 0;
|
||||
# proxy_pass http://minio_s3;
|
||||
# }
|
||||
|
||||
# Frontend SPA (host-приложение само отдаёт статику и роутинг)
|
||||
location / {
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
proxy_pass http://frontend;
|
||||
}
|
||||
# Frontend SPA (host-приложение само отдаёт статику и роутинг) (TODO: в работе)
|
||||
# location / {
|
||||
# proxy_set_header Host $host;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_set_header X-Forwarded-Proto $scheme;
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_set_header Upgrade $http_upgrade;
|
||||
# proxy_set_header Connection $connection_upgrade;
|
||||
# proxy_pass http://frontend;
|
||||
# }
|
||||
}
|
||||
|
||||
# ======================= Admin: RabbitMQ management UI ======================
|
||||
|
||||
Loading…
Reference in New Issue
Block a user