diff --git a/docker-compose.yml b/docker-compose.yml index 6ce923a..cb1d14a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,34 +21,12 @@ services: ports: - "30306:3306" healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"] timeout: 20s retries: 10 networks: - tk-network - postgres: - image: postgres:15-alpine - container_name: tk-postgres - restart: unless-stopped - environment: - POSTGRES_USER: ${POSTGRES_USER:-mproject} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - POSTGRES_DB: ${POSTGRES_DB:-mproject} - TZ: Asia/Seoul - PGTZ: Asia/Seoul - volumes: - - postgres_data:/var/lib/postgresql/data - - ./system3-nonconformance/api/migrations:/docker-entrypoint-initdb.d - ports: - - "30432:5432" - healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-mproject}"] - timeout: 10s - retries: 5 - networks: - - tk-network - redis: image: redis:6-alpine container_name: tk-redis @@ -321,9 +299,11 @@ services: - "30400:8000" environment: - OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-http://100.111.160.84:11434} - - OLLAMA_TEXT_MODEL=${OLLAMA_TEXT_MODEL:-qwen2.5:14b-instruct-q4_K_M} + - OLLAMA_TEXT_MODEL=${OLLAMA_TEXT_MODEL:-qwen3:8b} - OLLAMA_EMBED_MODEL=${OLLAMA_EMBED_MODEL:-bge-m3} - OLLAMA_TIMEOUT=${OLLAMA_TIMEOUT:-120} + - MLX_BASE_URL=${MLX_BASE_URL:-https://llm.hyungi.net} + - MLX_TEXT_MODEL=${MLX_TEXT_MODEL:-/Users/hyungi/mlx-models/Qwen3.5-27B-4bit} - DB_HOST=mariadb - DB_PORT=3306 - DB_USER=${MYSQL_USER:-hyungi_user} @@ -404,9 +384,6 @@ volumes: mariadb_data: external: true name: tkfb-package_db_data - postgres_data: - external: true - name: tkqc-package_postgres_data system1_uploads: external: true name: tkfb_api_uploads