fix: update docker file and profile

guzijian
1 parent d999ccb2
Showing 6 changed files with 124 additions and 19 deletions
docker-compose.yml
mysql-dockerfile
redis-dockerfile
ruoyi-admin/admin-dockerfile
ruoyi-admin/src/main/resources/application-druid-dev.yml
ruoyi-admin/src/main/resources/application-druid-uat.yml
 version: 3.8.5
 services:
   admin-server:
-    container_name: admin-server
+    container_name: ruoyi-admin
+    args:
+      # 项目名称
+      server_name: ruoyi-admin
+      # 环境
+      env_name: druid-uat
     build:
       context: .
       dockerfile: ./ruoyi-admin/admin-dockerfile
     volumes:
       - /ruoyi/back/logs:/home/ruoyi/logs
       - /ruoyi/back/uploadPath:/home/ruoyi/uploadPath
+    depends_on:
+      - redis-server
+      - mysql-server
     restart: on-failure
     ports:
       - 8080:8080
   mysql-server:
-    container_name: mysql_server
+    container_name: mysql-server
     image: mysql:5.7
     build:
       context: .
       dockerfile: mysql-dockerfile
     volumes:
-      - /ruoyi/mysql/conf.d:/etc/mysql/conf.d
-      - /ruoyi/mysql/logs:/logs
+      - /ruoyi/mysql/my.cnf:/etc/mysql/my.cnf
       - /ruoyi/mysql/data:/var/lib/mysql
+      - /ruoyi/mysql/logs/error.log:/var/log/mysql/error.log
+      - /ruoyi/mysql/logs/query.log:/var/log/mysql/query.log
     environment:
+      MYSQL_DATABASE: all-in-one
       MYSQL_ROOT_PASSWORD: guzijian
-      MYSQL_ROOT_HOST: '%'
       TZ: Asia/Shanghai
     restart: always
     command:
-      --character-set-server=utf8mb4
-      --collation-server=utf8mb4_general_ci
-      --explicit_defaults_for_timestamp=true
-      --lower_case_table_names=1
-      --max_allowed_packet=128M
-      --default-authentication-plugin=caching_sha2_password
+      [
+        'mysqld',
+        '--innodb-buffer-pool-size=80M',
+        '--character-set-server=utf8mb4',
+        '--collation-server=utf8mb4_unicode_ci',
+        '--default-time-zone=+8:00',
+        '--lower-case-table-names=1'
+      ]
     ports:
       - 3306:3306
   redis-server:
-    container_name: redis_server
+    container_name: redis-server
+    image: redis:7
     build:
       context: .
       dockerfile: redis-dockerfile
-    entrypoint:
     volumes:
-      - /ruoyi/redis/redis.conf:/etc/redis/redis.conf
+      - /ruoyi/redis/redis.conf:/usr/local/etc/redis/redis.conf
       - /ruoyi/redis/data:/data
     restart: always
     ports:
@@ -3,3 +3,8 @@ FROM mysql:5.7
 MAINTAINER guzijian
 # sql文件
 ADD ./sql/*.sql /docker-entrypoint-initdb.d/
+# 写入配置
+RUN echo "[mysqld]" >> /etc/mysql/my.cnf \
+    && echo "log-error=/var/log/mysql/error.log" >> /etc/mysql/my.cnf \
+    && echo "general_log_file=/var/log/mysql/query.log" >> /etc/mysql/my.cnf \
+    && echo "general_log = 1" >> /etc/mysql/my.cnf
 \ No newline at end of file
 FROM redis:7
-MAINTAINER guzijian
 \ No newline at end of file
+MAINTAINER guzijian
+RUN echo "requirepass guzijian" >> /usr/local/etc/redis/redis.conf
+# 设置Redis快照
+RUN sed -i 's/^# save ""/save 900 1\nsave 300 10\nsave 60 10000/g' /usr/local/etc/redis/redis.conf
+# 确保启动时使用容器内的配置
+CMD ["redis-server", "/usr/local/etc/redis/redis.conf"]
 \ No newline at end of file
-FROM java:8
+FROM openjdk:8
 # 作者
 MAINTAINER guzijian
 # 获取jar包名字
 ARG server_name
+# 启动环境
+ARG env_name
 # 获取参数
 ENV jar_name = $server_name
+# 获取环境
+ENV env_file = $env_name
 # 工作区
 RUN mkdir -p "/home/docker/"
 # 指定工作区
@@ -12,4 +16,4 @@ WORKDIR /home/docker/
 # 把jar包复制到容器内
 COPY ./*.jar /home/docker/
 # 执行命令
-ENTRYPOINT java -jar ${jar_name}.jar
 \ No newline at end of file
+ENTRYPOINT java -jar /home/docker/${jar_name}.jar --spring.profile.active=${env_file}
 \ No newline at end of file
@@ -60,6 +60,46 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+        # 文件上传
+        servlet:
+            multipart:
+                # 单个文件大小
+                max-file-size: 10MB
+                # 设置总上传的文件大小
+                max-request-size: 20MB
+        # 服务模块
+        devtools:
+            restart:
+                # 热部署开关
+                enabled: true
+        # redis 配置
+        redis:
+            # 地址
+            host: 121.41.83.61
+            database: 0
+            password: "guzijian"
+            port: 6379
+            # 连接超时时间
+            timeout: 10s
+            lettuce:
+                pool:
+                    # 连接池中的最小空闲连接
+                    min-idle: 0
+                    # 连接池中的最大空闲连接
+                    max-idle: 8
+                    # 连接池的最大数据库连接数
+                    max-active: 8
+                    # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                    max-wait: -1ms
+    # token配置
+    token:
+        # 令牌自定义标识
+        header: Authorization
+        # 令牌密钥
+        secret: abcdefghijklmnopqrstuvwxyz
+        # 令牌有效期（默认30分钟）
+        expireTime: 30
+
 # 项目相关配置
 ruoyi:
     # 名称
@@ -71,7 +111,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /home/ruoyi/uploadPath
+    profile: /ruoyi/ruoyi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -7,7 +7,7 @@ spring:
       # 主库数据源
       master:
         # 测试地址
-        url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://1.14.107.94:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: guzijian
       # 从库数据源
@@ -60,6 +60,46 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+    # 文件上传
+    servlet:
+      multipart:
+        # 单个文件大小
+        max-file-size: 10MB
+        # 设置总上传的文件大小
+        max-request-size: 20MB
+    # 服务模块
+    devtools:
+      restart:
+        # 热部署开关
+        enabled: true
+    # redis 配置
+    redis:
+      # 地址
+      host: 1.14.107.94
+      database: 0
+      password: "guzijian"
+      port: 6379
+      # 连接超时时间
+      timeout: 10s
+      lettuce:
+        pool:
+          # 连接池中的最小空闲连接
+          min-idle: 0
+          # 连接池中的最大空闲连接
+          max-idle: 8
+          # 连接池的最大数据库连接数
+          max-active: 8
+          # #连接池最大阻塞等待时间（使用负值表示没有限制）
+          max-wait: -1ms
+  # token配置
+  token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
+
 # 项目相关配置
 ruoyi:
   # 名称