docker swarm

docker-swarm/xxl-job-admin/README

@@ -1,4 +1,10 @@
 
 # crm1环境下  部署xxl-job
 
-env $(cat ./env_crm1 | xargs) envsubst < ./docker-compose.yml | docker stack deploy --compose-file - crm1_xxl_job
+env $(cat ./env_crm1 | xargs) envsubst < ./docker-compose.yml | docker stack deploy --compose-file - crm1_xxl_job
+
+
+env $(cat ./env_prod | xargs) envsubst < ./docker-compose.yml | docker stack deploy --compose-file - prod_xxl_job
+
+
+docker stack deploy --compose-file docker-compose.yml - portainer

docker-swarm/xxl-job-admin/docker-compose.yml

@@ -6,18 +6,19 @@ networks:
     external: true
 services:
   server:
-    image: 'xuxueli/xxl-job-admin:2.2.0'
+    image: 'xuxueli/xxl-job-admin:2.4.1'
+    hostname: ${NAMESPACE}-xxl-job-admin
     ports:
       - '${NODE_PORT}:8080'
     environment:
       - TZ=Asia/Shanghai
-      - PARAMS=--spring.datasource.url=jdbc:mysql://${DATASOURCE_URL}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai --spring.datasource.username=${DATASOURCE_USERNAME} --spring.datasource.password=${DATASOURCE_PASSWORD} 
+      - PARAMS=--xxl.job.logretentiondays=90 --xxl.job.accessToken=  --spring.datasource.url=jdbc:mysql://${DATASOURCE_URL}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai --spring.datasource.username=${DATASOURCE_USERNAME} --spring.datasource.password=${DATASOURCE_PASSWORD}
     deploy:
+      mode: replicated
+      replicas: ${REPLICAS}
       update_config:
         order: start-first
       placement:
         constraints:
-          - node.labels.${NAMESPACE}_xxl_job_admin==1
-
-
-
+          - node.labels.xxl_job_admin==1
+        max_replicas_per_node: 1

docker-swarm/xxl-job-admin/env_crm1

@@ -2,4 +2,5 @@ NAMESPACE=crm1
 NODE_PORT=9991
 DATASOURCE_URL=crm1_mysql_db:3306/xxl_job
 DATASOURCE_USERNAME=root
-DATASOURCE_PASSWORD=gkxl650
+DATASOURCE_PASSWORD=gkxl650
+REPLICAS=1

docker-swarm/xxl-job-admin/env_prod

@@ -0,0 +1,6 @@
+NAMESPACE=prod
+NODE_PORT=9991
+DATASOURCE_URL=prod-tool-mysql-master:3306/xxl_job
+DATASOURCE_USERNAME=zd_tool
+DATASOURCE_PASSWORD=gkxl2024#@
+REPLICAS=2