diff --git a/compose.yaml b/compose.yaml index 304f848..a94ba3f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -38,34 +38,38 @@ services: xiaoya-alist: image: xiaoyaliu/alist:latest profiles: [xiaoya] - container_name: xiaoya-alist + container_name: ${XYMEDIA_XIAOYA_CONTAINER:-xiaoya-alist} ports: ["5678:80", "2345:2345", "2346:2346"] volumes: - - "${XYMEDIA_INSTALL_DIR}/xiaoya:/data" - - "${XYMEDIA_INSTALL_DIR}/xiaoya/data:/www/data" + - "${XYMEDIA_XIAOYA_DATA_DIR:-${XYMEDIA_INSTALL_DIR}/xiaoya}:/data" + - "${XYMEDIA_XIAOYA_DATA_DIR:-${XYMEDIA_INSTALL_DIR}/xiaoya}/data:/www/data" restart: unless-stopped xiaoya-control: - image: ${XYMEDIA_BOOTSTRAP_IMAGE:-git.keeper.work/admin/xymediavault-bootstrap:1} + image: debian:bookworm-slim profiles: [xiaoya-control] container_name: xymedia-edge-controller - command: [/releases/current/bin/xymedia-edge, controller] + entrypoint: [/controller/xymedia-edge] + command: [controller] environment: XYMEDIA_CONTROLLER_TOKEN_FILE: /run/secrets/xiaoya-controller-token - XYMEDIA_XIAOYA_CONTAINER: xiaoya-alist + XYMEDIA_XIAOYA_CONTAINER: ${XYMEDIA_XIAOYA_CONTAINER:-xiaoya-alist} XYMEDIA_XIAOYA_DATA_DIR: /xiaoya - XYMEDIA_ALIYUN_TOKEN_URL: http://aliyuntvtoken:34256 - XYMEDIA_CONTROLLER_ADDR: :19090 - ports: ["127.0.0.1:19090:19090"] + XYMEDIA_ALIYUN_OPEN_TOKEN_URL: http://aliyuntvtoken:34256 + XYMEDIA_CONTROLLER_ADDR: "${XYMEDIA_CONTROLLER_BIND_ADDRESS:-0.0.0.0}:${XYMEDIA_CONTROLLER_PORT:-19090}" + XYMEDIA_HOST_ADDRESSES_FILE: /etc/xymedia/config/XYMEDIA_HOST_ADDRESSES + XYMEDIA_HOST_ADDRESSES: ${XYMEDIA_HOST_ADDRESSES:-} + ports: ["${XYMEDIA_CONTROLLER_BIND_ADDRESS:-0.0.0.0}:${XYMEDIA_CONTROLLER_PORT:-19090}:${XYMEDIA_CONTROLLER_PORT:-19090}"] volumes: - - "${XYMEDIA_INSTALL_DIR}/xiaoya:/xiaoya" - - "${XYMEDIA_INSTALL_DIR}/releases:/releases:ro" + - "${XYMEDIA_XIAOYA_DATA_DIR:-${XYMEDIA_INSTALL_DIR}/xiaoya}:/xiaoya" + - "${XYMEDIA_INSTALL_DIR}/config:/etc/xymedia/config:ro" + - "${XYMEDIA_INSTALL_DIR}/controller:/controller:ro" - /var/run/docker.sock:/var/run/docker.sock secrets: [xiaoya-controller-token] restart: unless-stopped aliyuntvtoken: image: ddsderek/xiaoya-glue:python profiles: [xiaoya] - command: [python, /app/alitoken2.py, --qrcode_mode, web] + command: [python, /aliyuntvtoken/alitoken2.py, --qrcode_mode, web] restart: unless-stopped app-migrate: image: ${XYMEDIA_BOOTSTRAP_IMAGE:-git.keeper.work/admin/xymediavault-bootstrap:1}