From 4d9dfddd5d4eac72e7f16537674ad2c399798003 Mon Sep 17 00:00:00 2001 From: arkonsadter Date: Sat, 17 Jan 2026 19:19:36 +0600 Subject: [PATCH] chore(docker): clean up docker-compose-simple.yml and remove backup file - 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 --- .gitignore | 1 + docker-compose-simple.yml | 17 +------------- docker-compose.txt.backup | 47 --------------------------------------- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 docker-compose.txt.backup diff --git a/.gitignore b/.gitignore index b7628fc..84437b2 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ frontend/dist/ backend/build/ backend/users1.json.backup docker-compose.txt +docker-compose-simple.yml diff --git a/docker-compose-simple.yml b/docker-compose-simple.yml index ff93566..0dfc4a5 100644 --- a/docker-compose-simple.yml +++ b/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 @@ -44,8 +33,4 @@ services: networks: mc-panel-network: - driver: bridge - -volumes: - servers-data: - users-data: \ No newline at end of file + driver: bridge \ No newline at end of file diff --git a/docker-compose.txt.backup b/docker-compose.txt.backup deleted file mode 100644 index d0bb726..0000000 --- a/docker-compose.txt.backup +++ /dev/null @@ -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 \ No newline at end of file