Compare commits
2 Commits
v1.2.0
...
4d9dfddd5d
| Author | SHA1 | Date | |
|---|---|---|---|
| 4d9dfddd5d | |||
| 9d19d49c9b |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -38,3 +38,4 @@ frontend/dist/
|
||||
backend/build/
|
||||
backend/users1.json.backup
|
||||
docker-compose.txt
|
||||
docker-compose-simple.yml
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
# MC Panel приложение
|
||||
mc-panel:
|
||||
build:
|
||||
context: .
|
||||
@@ -11,27 +10,17 @@ services:
|
||||
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
|
||||
@@ -45,7 +34,3 @@ services:
|
||||
networks:
|
||||
mc-panel-network:
|
||||
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
|
||||
@@ -13,12 +13,9 @@ services:
|
||||
- ZITADEL_ISSUER=${ZITADEL_ISSUER}
|
||||
- ZITADEL_CLIENT_ID=${ZITADEL_CLIENT_ID}
|
||||
- ZITADEL_CLIENT_SECRET=${ZITADEL_CLIENT_SECRET}
|
||||
|
||||
- BASE_URL=${BASE_URL:-http://localhost}
|
||||
- FRONTEND_URL=${FRONTEND_URL:-http://localhost}
|
||||
|
||||
- SECRET_KEY=${SECRET_KEY:-change-this-in-production}
|
||||
|
||||
- PYTHONUNBUFFERED=1
|
||||
volumes:
|
||||
- ./data/servers:/app/backend/servers
|
||||
|
||||
Reference in New Issue
Block a user