From e6b8d1fd823d82f1375e7d388b0a3021e67c3c9f Mon Sep 17 00:00:00 2001 From: Github_lizhw <171332584@qq.com> Date: Sat, 11 Apr 2026 22:53:16 +0800 Subject: [PATCH] =?UTF-8?q?docker=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/ruoyi-monitor-admin.run.xml | 12 -- .run/ruoyi-server.run.xml | 12 -- .run/ruoyi-snailjob-server.run.xml | 12 -- ruoyi-api/pom.xml | 23 --- ruoyi-api/ruoyi-api-bom/pom.xml | 32 ---- script/docker/config/mysql/my.cnf | 9 + .../{redis/conf => config/redis}/redis.conf | 0 script/docker/docker-compose.yml | 175 +++++++----------- script/docker/redis/data/README.md | 1 - script/ruoyi_docker/docker-compose.yml | 72 ++----- 10 files changed, 85 insertions(+), 263 deletions(-) delete mode 100644 .run/ruoyi-monitor-admin.run.xml delete mode 100644 .run/ruoyi-server.run.xml delete mode 100644 .run/ruoyi-snailjob-server.run.xml delete mode 100644 ruoyi-api/pom.xml delete mode 100644 ruoyi-api/ruoyi-api-bom/pom.xml create mode 100644 script/docker/config/mysql/my.cnf rename script/docker/{redis/conf => config/redis}/redis.conf (100%) delete mode 100644 script/docker/redis/data/README.md diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml deleted file mode 100644 index 478b4f30d..000000000 --- a/.run/ruoyi-monitor-admin.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml deleted file mode 100644 index 715389de5..000000000 --- a/.run/ruoyi-server.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.run/ruoyi-snailjob-server.run.xml b/.run/ruoyi-snailjob-server.run.xml deleted file mode 100644 index 5221eef4f..000000000 --- a/.run/ruoyi-snailjob-server.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml deleted file mode 100644 index 347235602..000000000 --- a/ruoyi-api/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - org.dromara - ruoyi-vue-plus - ${revision} - ../pom.xml - - 4.0.0 - - - ruoyi-api-bom - - - ruoyi-api - ${revision} - pom - - - ruoyi-api api依赖项 - - diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml deleted file mode 100644 index 4d634240a..000000000 --- a/ruoyi-api/ruoyi-api-bom/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - 4.0.0 - - org.dromara - ruoyi-api-bom - pom - ${revision} - - - ruoyi-api-bom api依赖项 - - - - 5.2.2-SNAPSHOT - - - - - - - - - - - - - - diff --git a/script/docker/config/mysql/my.cnf b/script/docker/config/mysql/my.cnf new file mode 100644 index 000000000..83675c40b --- /dev/null +++ b/script/docker/config/mysql/my.cnf @@ -0,0 +1,9 @@ +[mysqld] +user=mysql +default-storage-engine=INNODB +character-set-server=utf8mb4 +collation-server=utf8mb4_unicode_ci +[client] +default-character-set=utf8mb4 +[mysql] +default-character-set=utf8mb4 diff --git a/script/docker/redis/conf/redis.conf b/script/docker/config/redis/redis.conf similarity index 100% rename from script/docker/redis/conf/redis.conf rename to script/docker/config/redis/redis.conf diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index ef87a946a..cb417ad56 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -1,23 +1,22 @@ version: '3' services: - mysql: + mysql8: image: mysql:8.0.33 - container_name: mysql + container_name: mysql8 environment: # 时区上海 TZ: Asia/Shanghai # root 密码 MYSQL_ROOT_PASSWORD: root - # 初始化数据库(后续的初始化sql会在这个库执行) MYSQL_DATABASE: root ports: - "3306:3306" volumes: # 数据挂载 - - /docker/mysql/data/:/var/lib/mysql/ + - mysql8_data_volume:/var/lib/mysql/ # 配置挂载 - - /docker/mysql/conf/:/etc/mysql/conf.d/ + - ./config/mysql/conf/:/etc/mysql/conf.d/ #加载mysql的配置文件 command: # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) --default-authentication-plugin=mysql_native_password @@ -28,26 +27,50 @@ services: privileged: true network_mode: "host" - nginx-web: - image: nginx:1.23.4 - container_name: nginx-web + mysql57: + image: mysql:5.7 + container_name: mysql57 + command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: # 时区上海 TZ: Asia/Shanghai + MYSQL_ROOT_PASSWORD: root #设置root帐号密码 + MYSQL_DATABASE: mysql ports: - - "80:80" - - "443:443" + - "3308:3306" volumes: - # 证书映射 - - /docker/nginx/cert:/etc/nginx/cert - # 配置文件映射 - - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf - # 页面目录 - - /docker/nginx/html:/usr/share/nginx/html - # 日志目录 - - /docker/nginx/log:/var/log/nginx - privileged: true - network_mode: "host" + - ./config/mysql/conf/:/etc/mysql/conf.d/ #加载mysql的配置文件 + - mysql57_data_volume:/var/lib/mysql/ + expose: + - 3306 + deploy: + resources: + limits: + cpus: '0.25' + memory: 600M + reservations: + memory: 600M +# +# nginx-web: +# image: nginx:1.23.4 +# container_name: nginx-web +# environment: +# # 时区上海 +# TZ: Asia/Shanghai +# ports: +# - "80:80" +# - "443:443" +# volumes: +# # 证书映射 +# - /docker/nginx/cert:/etc/nginx/cert +# # 配置文件映射 +# - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf +# # 页面目录 +# - /docker/nginx/html:/usr/share/nginx/html +# # 日志目录 +# - /docker/nginx/log:/var/log/nginx +# privileged: true +# network_mode: "host" nacos-registry: image: nacos/nacos-server:v2.1.0 @@ -64,14 +87,26 @@ services: ports: - "6379:6379" volumes: - - volume_redis_data:/data - - ./redis/conf/redis.conf:/usr/local/etc/redis/redis.conf + - redis_data_volume:/data + - ./config/redis/redis.conf:/usr/local/etc/redis/redis.conf command: redis-server /usr/local/etc/redis/redis.conf environment: - TZ=Asia/Shanghai + rustfs: + image: registry.cn-shanghai.aliyuncs.com/study-03/rustfs:latest + container_name: rustfs + ports: + - "19000:9000" # API服务端口 + - "19001:9001" # 管理控制台 + volumes: + - rustfs_data_volume:/data + environment: + - RUSTFS_ACCESS_KEY=admin + - RUSTFS_SECRET_KEY=admin123 + restart: unless-stopped minio: - image: minio/minio:RELEASE.2024-06-06T09-36-42Z + image: minio/minio:RELEASE.2023-04-13T03-08-07Z container_name: minio ports: # api 端口 @@ -102,96 +137,10 @@ services: command: server --address ':9000' --console-address ':9001' /data # 指定容器中的目录 /data privileged: true - ruoyi-server1: - image: ruoyi/ruoyi-server:5.2.2 - container_name: ruoyi-server1 - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 8080 - volumes: - # 配置文件 - - /docker/server1/logs/:/ruoyi/server/logs/ - # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - ruoyi-sso-server: - image: ruoyi/ruoyi-sso-server:5.2.2 - container_name: ruoyi-sso-server - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 19000 - volumes: - # 配置文件 - - /docker/server1/logs/:/ruoyi/server/logs/ - # skywalking 探针 - # - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - - ruoyi-server2: - image: ruoyi/ruoyi-server:5.2.2 - container_name: ruoyi-server2 - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 8081 - volumes: - # 配置文件 - - /docker/server2/logs/:/ruoyi/server/logs/ - # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - - ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:5.2.2 - container_name: ruoyi-monitor-admin - environment: - # 时区上海 - TZ: Asia/Shanghai - volumes: - # 配置文件 - - /docker/monitor/logs/:/ruoyi/monitor/logs - privileged: true - network_mode: "host" - - ruoyi-snailjob-server: - image: ruoyi/ruoyi-snailjob-server:5.2.2 - container_name: ruoyi-snailjob-server - environment: - # 时区上海 - TZ: Asia/Shanghai - ports: - - "8800:8800" - - "17888:17888" - volumes: - - /docker/snailjob/logs/:/ruoyi/snailjob/logs - privileged: true - network_mode: "host" - - ruoyi-h5: - image: ruoyi/ruoyi-h5:5.2.2 - container_name: ruoyi-h5 - environment: - # 时区上海 - TZ: Asia/Shanghai - SERVER_PORT: 19200 - deploy: - resources: - limits: - memory: 512m # 限制内存为 512m - volumes: - # 配置文件 - - /docker/h5/logs/:/ruoyi/server/logs/ - # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent - privileged: true - network_mode: "host" - volumes: minio_data_volume: minio_config_volume: - volume_redis_data: + redis_data_volume: + mysql8_data_volume: + mysql57_data_volume: + rustfs_data_volume: diff --git a/script/docker/redis/data/README.md b/script/docker/redis/data/README.md deleted file mode 100644 index fbc5474bc..000000000 --- a/script/docker/redis/data/README.md +++ /dev/null @@ -1 +0,0 @@ -数据目录 请执行 `chmod 777 /docker/redis/data` 赋予读写权限 否则将无法写入数据 \ No newline at end of file diff --git a/script/ruoyi_docker/docker-compose.yml b/script/ruoyi_docker/docker-compose.yml index 570e2e440..6f0641091 100644 --- a/script/ruoyi_docker/docker-compose.yml +++ b/script/ruoyi_docker/docker-compose.yml @@ -1,58 +1,14 @@ -version: '3' -services: - mongo: - image: mongo:latest - container_name: mongo - volumes: - - /d/Program Files/docker/path/mall-swarm/mongo/db:/data/db #数据文件挂载 - ports: - - 27017:27017 - rustfs: - image: registry.cn-shanghai.aliyuncs.com/study-03/rustfs:latest - container_name: rustfs - ports: - - "19000:9000" # API服务端口 - - "19001:9001" # 管理控制台 - volumes: - - rustfs_data_volume:/data - environment: - - RUSTFS_ACCESS_KEY=admin - - RUSTFS_SECRET_KEY=admin123 - restart: unless-stopped - - minio: - image: minio/minio:RELEASE.2023-04-13T03-08-07Z - container_name: minio - ports: - # api 端口 - - "9000:9000" - # 控制台端口 - - "9001:9001" - environment: - # 时区上海 - TZ: Asia/Shanghai - # 管理后台用户名 - MINIO_ROOT_USER: admin - # 管理后台密码，最小8个字符 - MINIO_ROOT_PASSWORD: admin123 - # https需要指定域名 - #MINIO_SERVER_URL: "https://xxx.com:9000" - #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001" - # 开启压缩 on 开启 off 关闭 - MINIO_COMPRESS: "off" - # 扩展名 .pdf,.doc 为空 所有类型均压缩 - MINIO_COMPRESS_EXTENSIONS: "" - # mime 类型 application/pdf 为空 所有类型均压缩 - MINIO_COMPRESS_MIME_TYPES: "" - volumes: - # 映射当前目录下的data目录至容器内/data目录 - - minio_data_volume:/data - # 映射配置目录 - - minio_config_volume:/root/.minio/ - command: server --address ':9000' --console-address ':9001' /data # 指定容器中的目录 /data - privileged: true - -volumes: - rustfs_data_volume: - minio_data_volume: - minio_config_volume: +#version: '3' +#services: +# mongo: +# image: mongo:latest +# container_name: mongo +# volumes: +# - /d/Program Files/docker/path/mall-swarm/mongo/db:/data/db #数据文件挂载 +# ports: +# - 27017:27017 +# +#volumes: +# rustfs_data_volume: +# minio_data_volume: +# minio_config_volume: