From b424237343a1207281cdcb9c32bbf1a7e96457ad Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sun, 14 Dec 2025 16:53:53 +0800
Subject: [PATCH] =?UTF-8?q?docs(docker):=20=E6=B7=BB=E5=8A=A0=20Docker=20C?=
 =?UTF-8?q?ompose=20=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E5=B9=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 Docker 笔记中新增 Docker Compose 章节，介绍基本概念和常用命令
- 补充 Docker Compose 的构建、管理和执行相关指令说明
- 更新 xxl-job 项目的 docker-compose.yml 配置文件
- 为 MySQL 服务添加数据卷注释并调整挂载路径
- 将 xxl-job-admin 服务从镜
---
 docker-compose.yml | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 82205d66..9c0f34d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       - "3306:3306"
     volumes:
       - ./doc/db/tables_xxl_job.sql:/docker-entrypoint-initdb.d/tables_xxl_job.sql:ro
+      # Mysql 数据卷
       - /Users/admin/program/docker/instance/mysql/v2/conf:/etc/mysql/conf.d
       - /Users/admin/program/docker/instance/mysql/v2/logs:/var/log/mysql
       - /Users/admin/program/docker/instance/mysql/v2/data:/var/lib/mysql
@@ -27,7 +28,10 @@ services:
       - xxl-job-network
 
   xxl-job-admin:
-    image: xuxueli/xxl-job-admin:3.3.1
+#    image: xuxueli/xxl-job-admin:{version}
+    build:
+      context: ./xxl-job-admin
+      dockerfile: Dockerfile
     container_name: xxl-job-admin
     environment:
       PARAMS: >-
@@ -42,20 +46,21 @@ services:
     networks:
       - xxl-job-network
 
-#  xxl-job-executor-sample-springboot:
-#    image: xuxueli/xxl-job-executor-sample-springboot:3.3.2-SNAPSHOT
-#    container_name: xxl-job-executor-sample-springboot
-#    environment:
-#      PARAMS: "--xxl.job.admin.addresses=http://xxl-job-admin:8080/xxl-job-admin"
-#    ports:
-#      - "9999:9999"
-#    depends_on:
-#      mysql:
-#        condition: service_healthy
-#      xxl-job-admin:
-#        condition: service_healthy
-#    networks:
-#      - xxl-job-network
+  xxl-job-executor-sample-springboot:
+#    image: xuxueli/xxl-job-executor-sample-springboot:{version}
+    build:
+      context: ./xxl-job-executor-samples/xxl-job-executor-sample-springboot
+      dockerfile: Dockerfile
+    container_name: xxl-job-executor-sample-springboot
+    environment:
+      PARAMS: "--xxl.job.admin.addresses=http://xxl-job-admin:8080/xxl-job-admin"
+    ports:
+      - "9999:9999"
+    depends_on:
+      xxl-job-admin:
+        condition: service_started
+    networks:
+      - xxl-job-network
 
 networks:
   xxl-job-network: