From 0d656e8076b4d7e3b6bc0422eb7dee58687dd19c Mon Sep 17 00:00:00 2001
From: hajimi <phperbylyh@163.com>
Date: Fri, 12 Jun 2026 23:11:28 +0800
Subject: [PATCH] deploy: auto commit repo-root changes 2026-06-12 23:11:28

---
 docker/.env.example               |  1 +
 docker/.gitignore                 |  4 ++++
 docker/crawler/.dockerignore      |  4 ++--
 docker/crawler/.gitignore         |  6 +++---
 docker/crawler/Dockerfile         |  3 ++-
 docker/crawler/README.md          |  2 +-
 docker/docker-compose.crawler.yml | 12 ++++++------
 7 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 docker/.env.example

diff --git a/docker/.env.example b/docker/.env.example
new file mode 100644
index 0000000..bee9493
--- /dev/null
+++ b/docker/.env.example
@@ -0,0 +1 @@
+CRAWLER_DIR=./crawler
diff --git a/docker/.gitignore b/docker/.gitignore
index e891f33..5a4d165 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -1,4 +1,8 @@
 /data
 /log
+/logs
 .env
 .env.docker
+crawler/venv/
+crawler/logs/
+crawler/data/
diff --git a/docker/crawler/.dockerignore b/docker/crawler/.dockerignore
index aae9377..bfb1f60 100644
--- a/docker/crawler/.dockerignore
+++ b/docker/crawler/.dockerignore
@@ -3,8 +3,8 @@ __pycache__/
 **/__pycache__/
 *.pyc
 .pytest_cache/
-logs/*
-data/locks/*
+logs/
+data/
 test_output.txt
 tmp_*.py
 tmp_*.sql
diff --git a/docker/crawler/.gitignore b/docker/crawler/.gitignore
index 1a2e9b0..de5012a 100644
--- a/docker/crawler/.gitignore
+++ b/docker/crawler/.gitignore
@@ -10,9 +10,9 @@ build/
 venv/
 env/
 .env
-logs/*.log
-data/*.json
-data/*.csv
+logs/
+data/
+test_output.txt
 .idea/
 .vscode/
 *.swp
diff --git a/docker/crawler/Dockerfile b/docker/crawler/Dockerfile
index 90d40f7..93883fd 100644
--- a/docker/crawler/Dockerfile
+++ b/docker/crawler/Dockerfile
@@ -27,7 +27,8 @@ RUN python -m pip install --upgrade pip setuptools wheel \
 
 COPY . /app
 
-RUN mkdir -p /app/logs /app/data/locks /etc/sport-era-crawler \
+RUN sed -i 's/\r$//' /app/docker/entrypoint.sh \
+    && mkdir -p /app/logs /app/data/locks /etc/sport-era-crawler \
     && chmod +x /app/docker/entrypoint.sh
 
 ENTRYPOINT ["/app/docker/entrypoint.sh"]
diff --git a/docker/crawler/README.md b/docker/crawler/README.md
index 01b4091..2e05049 100644
--- a/docker/crawler/README.md
+++ b/docker/crawler/README.md
@@ -68,7 +68,7 @@ python main.py cron
 ## 项目结构
 
 ```
-dongqiudi-crawler/
+docker/crawler/
 ├── config/
 │   └── settings.yaml          # 配置文件
 ├── src/
diff --git a/docker/docker-compose.crawler.yml b/docker/docker-compose.crawler.yml
index 9727763..7a7b586 100644
--- a/docker/docker-compose.crawler.yml
+++ b/docker/docker-compose.crawler.yml
@@ -3,7 +3,7 @@ services:
     container_name: sport-era-crawler
     image: sport-era-crawler:latest
     build:
-      context: ${CRAWLER_DIR:-../server/public/dongqiudi-crawler}
+      context: ${CRAWLER_DIR:-./crawler}
       dockerfile: Dockerfile
     restart: always
     env_file:
@@ -14,8 +14,8 @@ services:
       DQD_TASKS_FILE: /app/config/crawler_tasks.yaml
       DQD_LOCK_DIR: /app/data/locks
     volumes:
-      - ${CRAWLER_DIR:-../server/public/dongqiudi-crawler}/logs:/app/logs
-      - ${CRAWLER_DIR:-../server/public/dongqiudi-crawler}/data:/app/data
+      - ${CRAWLER_DIR:-./crawler}/logs:/app/logs
+      - ${CRAWLER_DIR:-./crawler}/data:/app/data
     extra_hosts:
       - "host.docker.internal:host-gateway"
 
@@ -23,7 +23,7 @@ services:
     container_name: sport-era-kb-worker
     image: sport-era-crawler:latest
     build:
-      context: ${CRAWLER_DIR:-../server/public/dongqiudi-crawler}
+      context: ${CRAWLER_DIR:-./crawler}
       dockerfile: Dockerfile
     restart: always
     env_file:
@@ -33,7 +33,7 @@ services:
       DQD_CONFIG_PATH: /app/config/settings.yaml
     command: ["python", "scripts/kb_worker.py", "--batch=50", "--block-ms=5000", "--max-retries=3"]
     volumes:
-      - ${CRAWLER_DIR:-../server/public/dongqiudi-crawler}/logs:/app/logs
-      - ${CRAWLER_DIR:-../server/public/dongqiudi-crawler}/data:/app/data
+      - ${CRAWLER_DIR:-./crawler}/logs:/app/logs
+      - ${CRAWLER_DIR:-./crawler}/data:/app/data
     extra_hosts:
       - "host.docker.internal:host-gateway"