diff --git a/builder-docker/.DS_Store b/builder-docker/.DS_Store new file mode 100644 index 0000000..9e7ad95 Binary files /dev/null and b/builder-docker/.DS_Store differ diff --git a/builder-docker/fastdfs/docker-compose-old.yml b/builder-docker/fastdfs/docker-compose-old.yml new file mode 100644 index 0000000..efa4585 --- /dev/null +++ b/builder-docker/fastdfs/docker-compose-old.yml @@ -0,0 +1,46 @@ +version: '3' +services: + tracker: + image: harbor.sino-assist.com/season/fastdfs:1.2 + container_name: tracker + network_mode: host + restart: always + volumes: + - "./tracker_data:/fastdfs/tracker/data" + # ports: + # - "22122:22122" + command: "tracker" + + storage: + image: harbor.sino-assist.com/season/fastdfs:1.2 + container_name: storage + network_mode: host + # links: + # - tracker + restart: always + volumes: + - "./storage.conf:/fdfs_conf/storage.conf" + - "./storage_base_path:/fastdfs/storage/data" + - "./store_path0:/fastdfs/store_path" + #ports: + # - "23000:23000" + environment: + TRACKER_SERVER: "192.168.1.204:22122" + command: "storage" + + nginx: + image: harbor.sino-assist.com/season/fastdfs:1.2 + container_name: fdfs-nginx + network_mode: host + restart: always + volumes: + - "./nginx.conf:/etc/nginx/conf/nginx.conf" + - "./store_path0:/fastdfs/store_path" + # links: + # - tracker + # ports: + # - "8088:8088" + environment: + TRACKER_SERVER: "192.168.1.204:22122" + command: "nginx" + diff --git a/builder-docker/fastdfs/docker-compose.yml b/builder-docker/fastdfs/docker-compose.yml index 4179a19..c5c2ae0 100644 --- a/builder-docker/fastdfs/docker-compose.yml +++ b/builder-docker/fastdfs/docker-compose.yml @@ -1,46 +1,28 @@ version: '3' services: tracker: - image: season/fastdfs:1.2 container_name: tracker + image: ygqygq2/fastdfs-nginx:latest + command: tracker network_mode: host - restart: always volumes: - - "./tracker_data:/fastdfs/tracker/data" - # ports: - # - "22122:22122" - command: "tracker" - - storage: - image: season/fastdfs:1.2 - container_name: storage + - /data/tracker:/var/fdfs + ports: + - 22122:22122 + storage0: + container_name: storage0 + image: ygqygq2/fastdfs-nginx:latest + command: storage network_mode: host - # links: - # - tracker - restart: always - volumes: - - "./storage.conf:/fdfs_conf/storage.conf" - - "./storage_base_path:/fastdfs/storage/data" - - "./store_path0:/fastdfs/store_path" - #ports: - # - "23000:23000" + extra_hosts: + - "tracker:192.168.1.204" environment: - TRACKER_SERVER: "192.168.1.206:22122" - command: "storage" - - nginx: - image: season/fastdfs:1.2 - container_name: fdfs-nginx - network_mode: host - restart: always + - TRACKER_SERVER=tracker:22122 volumes: - - "./nginx.conf:/etc/nginx/conf/nginx.conf" - - "./store_path0:/fastdfs/store_path" - # links: - # - tracker - # ports: - # - "8088:8088" - environment: - TRACKER_SERVER: "192.168.1.206:22122" - command: "nginx" + - ./data/storage0:/var/fdfs + - 8080:8080 + depends_on: + - tracker + +## https://github.com/ygqygq2/fastdfs-nginx \ No newline at end of file diff --git a/builder-docker/fastdfs/storage.conf b/builder-docker/fastdfs/storage.conf index a4b2825..07e67fd 100644 --- a/builder-docker/fastdfs/storage.conf +++ b/builder-docker/fastdfs/storage.conf @@ -111,7 +111,7 @@ subdir_count_per_path=256 # tracker_server can ocur more than once, and tracker_server format is # "host:port", host can be hostname or ip address -tracker_server=192.168.209.121:22122 +# tracker_server=192.168.209.121:22122 #standard log level as syslog, case insensitive, value list: ### emerg for emergency diff --git a/builder-docker/java11/skywalking-agent/.DS_Store b/builder-docker/java11/skywalking-agent/.DS_Store new file mode 100644 index 0000000..d253b48 Binary files /dev/null and b/builder-docker/java11/skywalking-agent/.DS_Store differ diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-hikaricp-3.x-4.x-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/optional-plugins/apm-hikaricp-3.x-4.x-plugin-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/plugins/apm-hikaricp-3.x-4.x-plugin-8.15.0.jar rename to builder-docker/java11/skywalking-agent/optional-plugins/apm-hikaricp-3.x-4.x-plugin-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-kafka-commons-8.15.0.jar b/builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-commons-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/plugins/apm-kafka-commons-8.15.0.jar rename to builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-commons-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-kafka-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-plugin-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/plugins/apm-kafka-plugin-8.15.0.jar rename to builder-docker/java11/skywalking-agent/optional-plugins/apm-kafka-plugin-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-mybatis-3.x-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/optional-plugins/apm-mybatis-3.x-plugin-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/plugins/apm-mybatis-3.x-plugin-8.15.0.jar rename to builder-docker/java11/skywalking-agent/optional-plugins/apm-mybatis-3.x-plugin-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-shardingsphere-5.0.0-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/optional-plugins/apm-shardingsphere-5.0.0-plugin-8.15.0.jar similarity index 100% rename from builder-docker/java11/skywalking-agent/plugins/apm-shardingsphere-5.0.0-plugin-8.15.0.jar rename to builder-docker/java11/skywalking-agent/optional-plugins/apm-shardingsphere-5.0.0-plugin-8.15.0.jar diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-jdk-threading-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/plugins/apm-jdk-threading-plugin-8.15.0.jar new file mode 100644 index 0000000..eb02dec Binary files /dev/null and b/builder-docker/java11/skywalking-agent/plugins/apm-jdk-threading-plugin-8.15.0.jar differ diff --git a/builder-docker/java11/skywalking-agent/plugins/apm-jdk-threadpool-plugin-8.15.0.jar b/builder-docker/java11/skywalking-agent/plugins/apm-jdk-threadpool-plugin-8.15.0.jar new file mode 100644 index 0000000..4eb35eb Binary files /dev/null and b/builder-docker/java11/skywalking-agent/plugins/apm-jdk-threadpool-plugin-8.15.0.jar differ diff --git a/builder-docker/jenkins/Dockerfile b/builder-docker/jenkins/Dockerfile index bc3a051..b0f66d6 100644 --- a/builder-docker/jenkins/Dockerfile +++ b/builder-docker/jenkins/Dockerfile @@ -7,7 +7,7 @@ ADD gradle-8.7 /opt/gradle-8.7 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - -RUN apt-get install -y nodejs git vim curl sshpass +RUN apt-get install -y nodejs git vim curl sshpass pigz # ADD node-v18.20.2-linux-x64 /usr/local/node-v18.20.2-linux-x64 diff --git a/builder-docker/jenkins/gradle-8.7/lib/kotlin-compiler-embeddable-1.9.22.jar b/builder-docker/jenkins/gradle-8.7/lib/kotlin-compiler-embeddable-1.9.22.jar deleted file mode 100644 index 0aec461..0000000 Binary files a/builder-docker/jenkins/gradle-8.7/lib/kotlin-compiler-embeddable-1.9.22.jar and /dev/null differ diff --git a/builder-docker/jenkins/node-v18.20.2-linux-x64/bin/node b/builder-docker/jenkins/node-v18.20.2-linux-x64/bin/node deleted file mode 100755 index 066a70e..0000000 Binary files a/builder-docker/jenkins/node-v18.20.2-linux-x64/bin/node and /dev/null differ diff --git a/docker-swarm/.DS_Store b/docker-swarm/.DS_Store index b378868..0ed0213 100644 Binary files a/docker-swarm/.DS_Store and b/docker-swarm/.DS_Store differ diff --git a/docker-swarm/10.5x环境配置记录/1. 安装docker.md b/docker-swarm/10.5x环境配置记录/1. 安装docker.md index d4af279..cd047d0 100644 --- a/docker-swarm/10.5x环境配置记录/1. 安装docker.md +++ b/docker-swarm/10.5x环境配置记录/1. 安装docker.md @@ -29,7 +29,10 @@ sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/dock 接下来为了提高安装速度，我们进行配置使用国内源，输入如下指令： - sed -i 's@//download.docker.com@//mirrors.ustc.edu.cn/docker-ce@g' /etc/yum.repos.d/docker-ce.repo + ### sed -i 's@//download.docker.com@//mirrors.ustc.edu.cn/docker-ce@g' /etc/yum.repos.d/docker-ce.repo + + sed -i 's@//download.docker.com@//mirrors.aliyun.com/docker-ce@g' /etc/yum.repos.d/docker-ce.repo + 3、安装 输入如下指令，进行docker安装： diff --git a/docker-swarm/10.5x环境配置记录/3. 基本服务安装.md b/docker-swarm/10.5x环境配置记录/3. 基本服务安装.md index b7ccd23..2bc23b9 100644 --- a/docker-swarm/10.5x环境配置记录/3. 基本服务安装.md +++ b/docker-swarm/10.5x环境配置记录/3. 基本服务安装.md @@ -1,4 +1,7 @@ -1. 初始化网路 + +## 基础配置 + +### 1. 初始化网路 prod docker network create \ --driver=overlay \ --subnet=10.17.0.0/16 \ @@ -6,15 +9,93 @@ --attachable \ prod -1. rabbitmq - 管理界面： 192.168.10.51:15672 - 内部：prod_rabbitmq_stats:5672,prod_rabbitmq_queue1:5672,prod_rabbitmq_queue2:5672 - stomp url：192.168.10.51:15674 +### 2. [portainer](../portainer) 管理工具 + + docker stack deploy --compose-file docker-compose.yml portainer -2. xxl-job-adin + 管理界面： https://192.168.10.51:9443 - 管理界面： 192.168.10.51:9991 + 页面出现报错，docker service update portainer_agent --force -3. nacos + +### 3. [monitor](../monitor) + + 用于 grafana 监控 + + 管理界面： 192.168.10.51:3000 + admin gkxl2024#@ + +## 软件包 + +部署方法均参见文件夹内readme，变量在对于的env文件。 + +### 1. [rabbitmq](../rabbitmq) + 管理界面： 192.168.10.51:15672 + + 内部：prod_rabbitmq_stats:5672,prod_rabbitmq_queue1:5672,prod_rabbitmq_queue2:5672 + + stomp-url：192.168.10.51:15674 + +### 2. [xxl-job-adin](../xxl-job-admin) + + 管理界面： 192.168.10.51:9991 + + 内部：prod-xxl-job-admin:8080 + + +### 3. [nacos](../nacos-cluser) 管理界面： http://192.168.10.51:25848/nacos/ + + +### 4. [redis](../redis-prod-50) + + 端口：192.168.10.51:6379 + + 内部：prod_redis_redis-sentinel:16379 + +### 5. [elasticsearch](../elasticsearch) + + 管理界面： 192.168.10.51:5601 + + 外部端口： 192.168.10.51:9200 + + 内部端口： prod-es-elasticsearch:9200 + +### 6. [log](../log) + + 无管理界面，仅需要加载对于的volumes：prod-log + +### 7. [elasticsearch](../mysql-repl-tool) + + 管理界面： 192.168.10.51:5601 + + 外部端口： 192.168.10.51:9200 + + 内部端口： prod-es-elasticsearch:9200 + +### 8. [skywalking](../skywalking) + + 管理界面： 192.168.10.51:18080 + + 内部端口： prod-skywalking-oap:11800 + + +### 8. [mysql](../mysql-repl-tool) + + 用于 [nacos](../nacos-cluser/mysql-schema.sql)，xxl-job + + 管理界面： 192.168.10.51:25306 + + 内部端口： prod-tool-mysql-master:3306 prod-tool-mysql-salve:3306 + + +## 其余服务 + +[clickhouse](../clickhouse) 应用于服务 3.123 + +[datart](../datart) 依赖的服务，其中mysql服务bi正在使用，在3.123上 + +[jenkins](../jenkins) 3.120上专门用于部署 + +[canal](../canal) 用于数据同步只clickhouse，在3.120 \ No newline at end of file diff --git a/docker-swarm/clickhouse/docker-compose.yml b/docker-swarm/clickhouse/docker-compose.yml index 9fb3045..38701d6 100644 --- a/docker-swarm/clickhouse/docker-compose.yml +++ b/docker-swarm/clickhouse/docker-compose.yml @@ -15,6 +15,7 @@ services: - CLICKHOUSE_ADMIN_PASSWORD=${CLICKHOUSE_ADMIN_PASSWORD} volumes: - 'data_db:/bitnami/clickhouse' + - 'data_config:/opt/bitnami/clickhouse/etc' deploy: update_config: order: start-first @@ -31,5 +32,5 @@ services: volumes: data_db: driver: local - - + data_config: + driver: local diff --git a/docker-swarm/elasticsearch/docker-compose.yml b/docker-swarm/elasticsearch/docker-compose.yml index 6147738..fa4b5de 100644 --- a/docker-swarm/elasticsearch/docker-compose.yml +++ b/docker-swarm/elasticsearch/docker-compose.yml @@ -12,6 +12,7 @@ services: - '${NODE_PORT_2}:9300' environment: - TZ=Asia/Shanghai + - ELASTICSEARCH_HEAP_SIZE=8192m volumes: - '/mnt/data/volumes/elasticsearch:/bitnami/elasticsearch/data' deploy: diff --git a/docker-swarm/log/docker-compose.yml b/docker-swarm/log/docker-compose.yml index 3e19c73..764128c 100644 --- a/docker-swarm/log/docker-compose.yml +++ b/docker-swarm/log/docker-compose.yml @@ -14,6 +14,11 @@ services: configs: - source: logstash_conf target: /usr/share/logstash/pipeline/my.conf + logging: + driver: json-file + options: + max-size: "500m" + max-file: "3" deploy: placement: constraints: diff --git a/docker-swarm/monitor/docker-stack.yml b/docker-swarm/monitor/docker-stack.yml index f464c23..bcb071f 100644 --- a/docker-swarm/monitor/docker-stack.yml +++ b/docker-swarm/monitor/docker-stack.yml @@ -119,7 +119,7 @@ volumes: networks: net: - driver: overlay + driver: host diff --git a/docker-swarm/nginx-prod-50/docker-compose.yml b/docker-swarm/nginx-prod-50/docker-compose.yml index fe30b43..7e8c697 100644 --- a/docker-swarm/nginx-prod-50/docker-compose.yml +++ b/docker-swarm/nginx-prod-50/docker-compose.yml @@ -5,11 +5,17 @@ networks: name: ${NAMESPACE} external: true services: - server: + server1: image: 'docker.io/bitnami/nginx:1.24' ports: - - '8080:8080' - - '8443:8443' + - mode: host + protocol: tcp + published: 8180 + target: 8080 + - mode: host + protocol: tcp + published: 8143 + target: 8443 environment: - TZ=Asia/Shanghai volumes: @@ -25,19 +31,50 @@ services: target: /opt/bitnami/nginx/conf/server_blocks/sinoassist.com.pem - source: nginx_prod_config target: /opt/bitnami/nginx/conf/server_blocks/prod.conf - - source: nginx_prod_sup_config - target: /opt/bitnami/nginx/conf/server_blocks/prod-sup.conf - - source: nginx_other_config - target: /opt/bitnami/nginx/conf/server_blocks/zd-other.conf deploy: mode: replicated - replicas: 2 + replicas: 1 update_config: order: start-first placement: constraints: - - node.labels.${NAMESPACE}_nginx==1 + - node.hostname==ZD-CRM1 + server2: + image: 'docker.io/bitnami/nginx:1.24' + ports: + - mode: host + protocol: tcp + published: 8280 + target: 8080 + - mode: host + protocol: tcp + published: 8243 + target: 8443 + environment: + - TZ=Asia/Shanghai + volumes: + - /opt/logs/nginx/:/opt/bitnami/nginx/logs/ + configs: + - source: nginx_conf + target: /opt/bitnami/nginx/conf/nginx.conf + - source: nginx_ssl_sinoassist_config + target: /opt/bitnami/nginx/conf/ssl.sinoassist.conf + - source: ssl_sinoassist_key + target: /opt/bitnami/nginx/conf/server_blocks/sinoassist.com.key + - source: ssl_sinoassist_pem + target: /opt/bitnami/nginx/conf/server_blocks/sinoassist.com.pem + - source: nginx_prod_config + target: /opt/bitnami/nginx/conf/server_blocks/prod.conf + + deploy: + mode: replicated + replicas: 1 + update_config: + order: start-first + placement: + constraints: + - node.hostname==ZD-CRM2 configs: nginx_conf: external: true @@ -47,13 +84,7 @@ configs: name: nginx_ssl_sinoassist_conf_v1 nginx_prod_config: external: true - name: nginx_prod_config_v1 - nginx_prod_sup_config: - external: true - name: nginx_prod_sup_config_v1 - nginx_other_config: - external: true - name: nginx_other_config_v1 + name: nginx_prod_config_v2 ssl_sinoassist_key: external: true name: ssl_sinoassist_key_2024 diff --git a/docker-swarm/nginx-prod-50/nginx_other_config_v1 b/docker-swarm/nginx-prod-50/nginx_other_config_v1 deleted file mode 100644 index 550b3a0..0000000 --- a/docker-swarm/nginx-prod-50/nginx_other_config_v1 +++ /dev/null @@ -1,44 +0,0 @@ -## 公司其他域名的切换 - -# 4s店微信 -server { - listen 8080; - server_name wx4s.sinoassist.com; - - location / { - proxy_pass http://192.168.10.7:8777; - } -} - - -# 微信供应商 -server { - listen 8080; - server_name wxdd.sinoassist.com; - - location / { - proxy_pass http://192.168.10.7:8568; - } -} - -# 呼叫中心接口 -server { - listen 8080; - server_name apicc.sinoassist.com; - include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; - - location / { - proxy_pass http://192.168.5.201:8080; - } -} - -# 呼叫中心接口websocket -server { - listen 8080; - server_name apiccws.sinoassist.com; - include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; - - location / { - proxy_pass http://192.168.5.201:1884; - } -} \ No newline at end of file diff --git a/docker-swarm/nginx-prod-50/nginx_prod_config_v1 b/docker-swarm/nginx-prod-50/nginx_prod_config_v1 index 6b0afcf..9719dc1 100644 --- a/docker-swarm/nginx-prod-50/nginx_prod_config_v1 +++ b/docker-swarm/nginx-prod-50/nginx_prod_config_v1 @@ -1,4 +1,5 @@ +#### 中道prod环境开始 #### upstream api.zhongdao { server ss52_sa-gateway_svc:8080; @@ -164,4 +165,118 @@ server { add_header Strict-Transport-Security max-age=15768000; return 301 https://www.sinoassist.com$request_uri; -} \ No newline at end of file +} + +#### 中道prod环境结束 #### + +## 公司其他域名的切换 + +# 4s店微信 +server { + listen 8080; + server_name wx4s.sinoassist.com; + + location / { + proxy_pass http://192.168.10.7:8777; + } +} + + +# 微信供应商 +server { + listen 8080; + server_name wxdd.sinoassist.com; + + location / { + proxy_pass http://192.168.10.7:8568; + } +} + +# 呼叫中心接口 +server { + listen 8080; + server_name apicc.sinoassist.com; + include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; + + location / { + proxy_pass http://192.168.5.201:8080; + } +} + +# 呼叫中心接口websocket +server { + listen 8080; + server_name apiccws.sinoassist.com; + include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; + + location / { + proxy_pass http://192.168.5.201:1884; + } +} + + +## 救援生产环境其他服务域名切换 + + +## rabbitmq stomp +upstream stomp.zhongdao { + server prod_rabbitmq_queue1:15674; + server prod_rabbitmq_queue2:15674; + server prod_rabbitmq_stats:15674; +} + +server { + listen 8080; + include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; + server_name stomp.sinoassist.com; + + location / { + proxy_pass http://stomp.zhongdao; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} + + +# 备份文件服务器 +server { + listen 8080; + server_name file.sinoassist.com; + include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; + + # 录音文件服务器 + location /ly/ { + proxy_pass http://192.168.5.204:8088/; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Host $server_name; + proxy_set_header X-Forwarded-For + $proxy_add_x_forwarded_for; + if ($request_filename ~ .*\.(htm|html)$) + { + add_header Cache-Control no-cache; + } + + } + + # 备份文件服务器 + location / { + proxy_pass http://192.168.10.18:8888; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Host $server_name; + proxy_set_header X-Forwarded-For + $proxy_add_x_forwarded_for; + if ($request_filename ~ .*\.(htm|html)$) + { + add_header Cache-Control no-cache; + } + + } +} diff --git a/docker-swarm/nginx-prod-50/nginx_prod_sup_config_v1 b/docker-swarm/nginx-prod-50/nginx_prod_sup_config_v1 deleted file mode 100644 index bdff3ce..0000000 --- a/docker-swarm/nginx-prod-50/nginx_prod_sup_config_v1 +++ /dev/null @@ -1,65 +0,0 @@ -## 救援生产环境其他服务域名切换 - - -## rabbitmq stomp -upstream stomp.zhongdao { - server prod_rabbitmq_queue1:15674; - server prod_rabbitmq_queue2:15674; - server prod_rabbitmq_stats:15674; -} - -server { - listen 8080; - include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; - server_name stomp.sinoassist.com; - - location / { - proxy_pass http://stomp.zhongdao; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_http_version 1.1; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } -} - - -# 备份文件服务器 -server { - listen 8080; - server_name file.sinoassist.com; - include /opt/bitnami/nginx/conf/ssl.sinoassist.conf; - - # 录音文件服务器 - location /ly/ { - proxy_pass http://192.168.5.204:8088/; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Host $server_name; - proxy_set_header X-Forwarded-For - $proxy_add_x_forwarded_for; - if ($request_filename ~ .*\.(htm|html)$) - { - add_header Cache-Control no-cache; - } - - } - - # 备份文件服务器 - location / { - proxy_pass http://192.168.10.18:8888; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Host $server_name; - proxy_set_header X-Forwarded-For - $proxy_add_x_forwarded_for; - if ($request_filename ~ .*\.(htm|html)$) - { - add_header Cache-Control no-cache; - } - - } -} diff --git a/docker-swarm/portainer/README.md b/docker-swarm/portainer/README.md new file mode 100644 index 0000000..99b0a14 --- /dev/null +++ b/docker-swarm/portainer/README.md @@ -0,0 +1 @@ +docker stack deploy --compose-file docker-compose.yml - portainer \ No newline at end of file diff --git a/docker-swarm/rabbitmq/README b/docker-swarm/rabbitmq/README index bf065a6..a108e0b 100644 --- a/docker-swarm/rabbitmq/README +++ b/docker-swarm/rabbitmq/README @@ -20,4 +20,19 @@ rabbitmqctl set_permissions -p / admin ".*" ".*" ".*" # prod环境下 部署rabbitmq集群 -env $(cat ./env_prod | xargs) envsubst < ./docker-compose-prod.yml | docker stack deploy --compose-file - prod_rabbitmq \ No newline at end of file +env $(cat ./env_prod | xargs) envsubst < ./docker-compose-prod.yml | docker stack deploy --compose-file - prod_rabbitmq + + +docker.nju.edu.cn + + +{ + "registry-mirrors": [ + "https://.mirror.aliyuncs.com", + "https://dockerproxy.com", + "https://mirror.baidubce.com", + "https://docker.m.daocloud.io", + "https://docker.nju.edu.cn", + "https://docker.mirrors.sjtug.sjtu.edu.cn" + ] +} diff --git a/docker-swarm/rabbitmq/docker-compose-prod.yml b/docker-swarm/rabbitmq/docker-compose-prod.yml index 5d8f9ae..78bd4f7 100644 --- a/docker-swarm/rabbitmq/docker-compose-prod.yml +++ b/docker-swarm/rabbitmq/docker-compose-prod.yml @@ -17,6 +17,7 @@ services: - RABBITMQ_VHOSTS=/${NAMESPACE} - RABBITMQ_USERNAME=root - RABBITMQ_PASSWORD=${RABBITMQ_PASSWORD} + - RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS=true - RABBITMQ_PLUGINS=rabbitmq_management,rabbitmq_stomp,rabbitmq_web_stomp - RABBITMQ_LOGS=- ports: @@ -42,6 +43,7 @@ services: - RABBITMQ_VHOSTS=/${NAMESPACE} - RABBITMQ_USERNAME=root - RABBITMQ_PASSWORD=${RABBITMQ_PASSWORD} + - RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS=true - RABBITMQ_PLUGINS=rabbitmq_stomp,rabbitmq_web_stomp - RABBITMQ_LOGS=- volumes: @@ -65,6 +67,7 @@ services: - RABBITMQ_VHOSTS=/${NAMESPACE} - RABBITMQ_USERNAME=root - RABBITMQ_PASSWORD=${RABBITMQ_PASSWORD} + - RABBITMQ_MANAGEMENT_ALLOW_WEB_ACCESS=true - RABBITMQ_PLUGINS=rabbitmq_stomp,rabbitmq_web_stomp - RABBITMQ_LOGS=- volumes: diff --git a/docker-swarm/redis copy/env_prod b/docker-swarm/redis copy/env_prod deleted file mode 100644 index 8877fb1..0000000 --- a/docker-swarm/redis copy/env_prod +++ /dev/null @@ -1,4 +0,0 @@ -NAMESPACE=prod -NODE_PORT=6379 -REDIS_PASSWORD=gkxl650 -REDIS_SENTINEL_PASSWORD=gkxl650 \ No newline at end of file diff --git a/docker-swarm/redis copy/README b/docker-swarm/redis-prod-50/README similarity index 100% rename from docker-swarm/redis copy/README rename to docker-swarm/redis-prod-50/README diff --git a/docker-swarm/redis-prod-50/docker-compose.yml b/docker-swarm/redis-prod-50/docker-compose.yml new file mode 100644 index 0000000..a4967a7 --- /dev/null +++ b/docker-swarm/redis-prod-50/docker-compose.yml @@ -0,0 +1,116 @@ +version: '3.8' + +networks: + default: + name: ${NAMESPACE} + external: true +services: + master: + image: 'bitnami/redis:7.0.11' + environment: + - TZ=Asia/Shanghai + - REDIS_MASTER_HOST=192.168.10.4 + - REDIS_REPLICATION_MODE=slave + - REDIS_MASTER_PASSWORD=${REDIS_PASSWORD} + - REDIS_PASSWORD=${REDIS_PASSWORD} + - REDIS_REPLICA_IP=192.168.10.55 + ports: + - mode: host + protocol: tcp + published: 6379 + target: 6379 + volumes: + - data_master:/bitnami + deploy: + update_config: + order: stop-first + placement: + constraints: + - node.hostname==ZD-CRM5 + slave: + image: 'bitnami/redis:7.0.11' + environment: + - TZ=Asia/Shanghai + - REDIS_REPLICATION_MODE=slave + - REDIS_MASTER_HOST=192.168.10.4 + - REDIS_MASTER_PASSWORD=${REDIS_PASSWORD} + - REDIS_PASSWORD=${REDIS_PASSWORD} + - REDIS_REPLICA_IP=192.168.10.56 + ports: + - mode: host + protocol: tcp + published: 6379 + target: 6379 + depends_on: + - master + volumes: + - data_slave:/bitnami + deploy: + update_config: + order: stop-first + placement: + constraints: + - node.hostname==ZD-CRM6 + sentinel-1: + image: 'bitnami/redis-sentinel:7.0.11' + environment: + - TZ=Asia/Shanghai + - REDIS_MASTER_HOST=192.168.10.4 + - REDIS_MASTER_PASSWORD=${REDIS_PASSWORD} + - REDIS_SENTINEL_ANNOUNCE_IP=192.168.10.55 + - REDIS_PASSWORD=${REDIS_PASSWORD} + - REDIS_SENTINEL_PASSWORD=${REDIS_SENTINEL_PASSWORD} + depends_on: + - master + - slave + ports: + - mode: host + protocol: tcp + published: 26379 + target: 26379 + deploy: + update_config: + order: stop-first + mode: replicated + replicas: 1 # replicas模式， 副本数目为1 + placement: + constraints: + - node.hostname==ZD-CRM5 + volumes: + - data_sentinel_1:/bitnami + sentinel-2: + image: 'bitnami/redis-sentinel:7.0.11' + environment: + - TZ=Asia/Shanghai + - REDIS_MASTER_HOST=192.168.10.4 + - REDIS_MASTER_PASSWORD=${REDIS_PASSWORD} + - REDIS_SENTINEL_ANNOUNCE_IP=192.168.10.56 + - REDIS_PASSWORD=${REDIS_PASSWORD} + - REDIS_SENTINEL_PASSWORD=${REDIS_SENTINEL_PASSWORD} + depends_on: + - master + - slave + ports: + - mode: host + protocol: tcp + published: 26379 + target: 26379 + deploy: + update_config: + order: stop-first + mode: replicated + replicas: 1 # replicas模式， 副本数目为1 + placement: + constraints: + - node.hostname==ZD-CRM6 + volumes: + - data_sentinel_2:/bitnami +volumes: + data_sentinel_1: + driver: local + data_sentinel_2: + driver: local + data_master: + driver: local + data_slave: + driver: local diff --git a/docker-swarm/redis copy/env_crm1 b/docker-swarm/redis-prod-50/env_crm1 similarity index 100% rename from docker-swarm/redis copy/env_crm1 rename to docker-swarm/redis-prod-50/env_crm1 diff --git a/docker-swarm/redis-prod-50/env_prod b/docker-swarm/redis-prod-50/env_prod new file mode 100644 index 0000000..0be0929 --- /dev/null +++ b/docker-swarm/redis-prod-50/env_prod @@ -0,0 +1,4 @@ +NAMESPACE=prod +NODE_PORT=6379 +REDIS_PASSWORD=sino#650 +REDIS_SENTINEL_PASSWORD=sino#650 \ No newline at end of file diff --git a/docker-swarm/redis copy/docker-compose.yml b/docker-swarm/redis/docker-compose copy.yml similarity index 54% rename from docker-swarm/redis copy/docker-compose.yml rename to docker-swarm/redis/docker-compose copy.yml index ffdd65e..484502a 100644 --- a/docker-swarm/redis copy/docker-compose.yml +++ b/docker-swarm/redis/docker-compose copy.yml @@ -9,63 +9,81 @@ services: image: 'bitnami/redis:7.0.11' environment: - TZ=Asia/Shanghai + - REDIS_MASTER_HOST=192.168.1.207 - REDIS_REPLICATION_MODE=master + - REDIS_MASTER_PASSWORD=${REDIS_PASSWORD} - REDIS_PASSWORD=${REDIS_PASSWORD} + - REDIS_REPLICA_IP=192.168.1.207 ports: - - '${NODE_PORT}:6379' + - mode: host + protocol: tcp + published: 6379 + target: 6379 volumes: - data_master:/bitnami deploy: update_config: - order: start-first + order: stop-first placement: constraints: - - node.labels.${NAMESPACE}_redis_master==1 + - node.hostname==okd7 slave: image: 'bitnami/redis:7.0.11' environment: - TZ=Asia/Shanghai - REDIS_REPLICATION_MODE=slave - - REDIS_MASTER_HOST=${NAMESPACE}_redis_master + - REDIS_MASTER_HOST=192.168.1.207 - REDIS_MASTER_PASSWORD=${REDIS_PASSWORD} - REDIS_PASSWORD=${REDIS_PASSWORD} + - REDIS_REPLICA_IP=192.168.1.208 + ports: + - mode: host + protocol: tcp + published: 6379 + target: 6379 depends_on: - master volumes: - data_slave:/bitnami deploy: update_config: - order: start-first + order: stop-first placement: constraints: - - node.labels.${NAMESPACE}_redis_slave==1 + - node.hostname==zd-dev-208 redis-sentinel: image: 'bitnami/redis-sentinel:7.0.11' environment: - TZ=Asia/Shanghai - - REDIS_MASTER_HOST=${NAMESPACE}_redis_master + - REDIS_MASTER_HOST=192.168.1.207 - REDIS_MASTER_PASSWORD=${REDIS_PASSWORD} + - REDIS_SENTINEL_ANNOUNCE_IP=192.168.1.209 + - REDIS_PASSWORD=${REDIS_PASSWORD} - REDIS_SENTINEL_PASSWORD=${REDIS_SENTINEL_PASSWORD} depends_on: - master - slave + ports: + - mode: host + protocol: tcp + published: 26379 + target: 26379 deploy: update_config: - order: start-first - mode: global + order: stop-first + mode: replicated + replicas: 1 # replicas模式， 副本数目为1 placement: constraints: - - node.labels.${NAMESPACE}_redis_sentinel==1 - max_replicas_per_node: 1 + - node.hostname==zd-dev-209 volumes: - - data_sentinel:/bitnami + - data_sentinel_1:/bitnami volumes: - data_sentinel: + data_sentinel_1: + driver: local + data_sentinel_2: driver: local data_master: driver: local data_slave: - driver: local - - - + driver: local \ No newline at end of file diff --git a/docker-swarm/xxl-job-admin/README b/docker-swarm/xxl-job-admin/README index f64c94d..e791a34 100644 --- a/docker-swarm/xxl-job-admin/README +++ b/docker-swarm/xxl-job-admin/README @@ -6,5 +6,3 @@ env $(cat ./env_crm1 | xargs) envsubst < ./docker-compose.yml | docker stack dep 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 \ No newline at end of file