chore(docker): clean up docker-compose-simple.yml and remove backup file
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
- Remove inline comments from docker-compose-simple.yml for cleaner configuration - Delete unused docker-compose.txt.backup file - Remove unused volume definitions (servers-data, users-data) - Add docker-compose-simple.yml to .gitignore to prevent accidental commits - Simplify environment variable organization by removing comment separators - Improve file maintainability by reducing comment clutter
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -38,3 +38,4 @@ frontend/dist/
|
|||||||
backend/build/
|
backend/build/
|
||||||
backend/users1.json.backup
|
backend/users1.json.backup
|
||||||
docker-compose.txt
|
docker-compose.txt
|
||||||
|
docker-compose-simple.yml
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# MC Panel приложение
|
|
||||||
mc-panel:
|
mc-panel:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
@@ -11,27 +10,17 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "80:8000" # Прямой доступ через порт 80
|
- "80:8000" # Прямой доступ через порт 80
|
||||||
environment:
|
environment:
|
||||||
# ZITADEL OpenID Connect
|
|
||||||
- ZITADEL_ISSUER=${ZITADEL_ISSUER}
|
- ZITADEL_ISSUER=${ZITADEL_ISSUER}
|
||||||
- ZITADEL_CLIENT_ID=${ZITADEL_CLIENT_ID}
|
- ZITADEL_CLIENT_ID=${ZITADEL_CLIENT_ID}
|
||||||
- ZITADEL_CLIENT_SECRET=${ZITADEL_CLIENT_SECRET}
|
- ZITADEL_CLIENT_SECRET=${ZITADEL_CLIENT_SECRET}
|
||||||
|
|
||||||
# URLs
|
|
||||||
- BASE_URL=${BASE_URL:-http://localhost}
|
- BASE_URL=${BASE_URL:-http://localhost}
|
||||||
- FRONTEND_URL=${FRONTEND_URL:-http://localhost}
|
- FRONTEND_URL=${FRONTEND_URL:-http://localhost}
|
||||||
|
|
||||||
# Security
|
|
||||||
- SECRET_KEY=${SECRET_KEY:-change-this-in-production}
|
- SECRET_KEY=${SECRET_KEY:-change-this-in-production}
|
||||||
|
|
||||||
# Python
|
|
||||||
- PYTHONUNBUFFERED=1
|
- PYTHONUNBUFFERED=1
|
||||||
volumes:
|
volumes:
|
||||||
# Персистентное хранилище для серверов
|
|
||||||
- ./data/servers:/app/backend/servers
|
- ./data/servers:/app/backend/servers
|
||||||
# Персистентное хранилище для пользователей и тикетов
|
|
||||||
- ./data/users.json:/app/backend/users.json
|
- ./data/users.json:/app/backend/users.json
|
||||||
- ./data/tickets.json:/app/backend/tickets.json
|
- ./data/tickets.json:/app/backend/tickets.json
|
||||||
# Папка для данных демонов
|
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
networks:
|
networks:
|
||||||
- mc-panel-network
|
- mc-panel-network
|
||||||
@@ -44,8 +33,4 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
mc-panel-network:
|
mc-panel-network:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
|
|
||||||
volumes:
|
|
||||||
servers-data:
|
|
||||||
users-data:
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
version: '3.8'
|
|
||||||
|
|
||||||
services:
|
|
||||||
# MC Panel приложение
|
|
||||||
mc-panel:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
container_name: mc-panel
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "80:8000" # Прямой доступ через порт 80
|
|
||||||
environment:
|
|
||||||
# ZITADEL OpenID Connect
|
|
||||||
- ZITADEL_ISSUER=${ZITADEL_ISSUER}
|
|
||||||
- ZITADEL_CLIENT_ID=${ZITADEL_CLIENT_ID}
|
|
||||||
- ZITADEL_CLIENT_SECRET=${ZITADEL_CLIENT_SECRET}
|
|
||||||
|
|
||||||
# URLs
|
|
||||||
- BASE_URL=${BASE_URL:-http://localhost}
|
|
||||||
- FRONTEND_URL=${FRONTEND_URL:-http://localhost}
|
|
||||||
|
|
||||||
# Security
|
|
||||||
- SECRET_KEY=${SECRET_KEY:-change-this-in-production}
|
|
||||||
|
|
||||||
# Python
|
|
||||||
- PYTHONUNBUFFERED=1
|
|
||||||
volumes:
|
|
||||||
# Персистентное хранилище для серверов
|
|
||||||
- ./data/servers:/app/backend/servers
|
|
||||||
# Персистентное хранилище для пользователей и тикетов
|
|
||||||
- ./data/users.json:/app/backend/users.json
|
|
||||||
- ./data/tickets.json:/app/backend/tickets.json
|
|
||||||
# Папка для данных демонов
|
|
||||||
- ./data:/app/data
|
|
||||||
networks:
|
|
||||||
- mc-panel-network
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8000/api/auth/oidc/providers"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 40s
|
|
||||||
|
|
||||||
networks:
|
|
||||||
mc-panel-network:
|
|
||||||
driver: bridge
|
|
||||||
Reference in New Issue
Block a user