From 10f41204f0d71488b29283e7eb2941967b21dd69 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 6 Sep 2023 15:39:23 +0800 Subject: [PATCH] fix: build --- docker-cloud/docker-compose.yml | 2 +- docker-cloud/gitea/docker-compose.yml | 11 +++++----- docker-cloud/mysql/conf/my.cnf | 28 +++++++++++++++++++++----- docker-cloud/nacos/.env.development | 4 ++-- docker-cloud/nginx/Dockerfile | 9 +++++++++ docker-cloud/nginx/default.conf | 11 ++++++++++ docker-cloud/nginx/docker-compose.yaml | 16 +++++++++++++++ 7 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 docker-cloud/nginx/Dockerfile create mode 100644 docker-cloud/nginx/default.conf create mode 100644 docker-cloud/nginx/docker-compose.yaml diff --git a/docker-cloud/docker-compose.yml b/docker-cloud/docker-compose.yml index eff81dc7..17976248 100644 --- a/docker-cloud/docker-compose.yml +++ b/docker-cloud/docker-compose.yml @@ -12,7 +12,7 @@ services: container_name: nacos restart: always env_file: - - nacos/.env.production + - nacos/.env.development ports: - 8848:8848 - 9848:9848 diff --git a/docker-cloud/gitea/docker-compose.yml b/docker-cloud/gitea/docker-compose.yml index 9519c891..e544c5d9 100644 --- a/docker-cloud/gitea/docker-compose.yml +++ b/docker-cloud/gitea/docker-compose.yml @@ -12,14 +12,15 @@ services: container_name: gitea-server environment: - GITEA__database__DB_TYPE=mysql - - GITEA__database__HOST=120.26.168.56:8052 - - GITEA__database__NAME=gitea - - GITEA__database__USER=root - - GITEA__database__PASSWD=kanglai@2022 + - GITEA__database__HOST=124.71.99.36:3158 + - GITEA__database__NAME=db_gitea + - GITEA__database__USER=u_git_account + - GITEA__database__PASSWD=#Gitea@&2021% hostname: gitea-server restart: always volumes: - - gitea:/data + #- gitea:/data + - /usr/software/dockerDatabase/gitea/data:/data - /usr/software/dockerDatabase/gitea/timezone:/etc/timezone:ro - /usr/software/dockerDatabase/gitea/localtime:/etc/localtime:ro ports: diff --git a/docker-cloud/mysql/conf/my.cnf b/docker-cloud/mysql/conf/my.cnf index 206dd965..d9e6f00e 100644 --- a/docker-cloud/mysql/conf/my.cnf +++ b/docker-cloud/mysql/conf/my.cnf @@ -1,7 +1,3 @@ -[client] -# 设置mysql客户端默认字符集 -default-character-set = utf8 - [mysqld] # 跨库多表连接查询 federated = 1 @@ -11,9 +7,31 @@ port = 3306 max_connections = 2000 # 创建新表时将使用的默认存储引擎 default-storage-engine = INNODB +# 不区分大小写 lower_case_table_names = 1 # 禁止域名解析 skip-name-resolve = 1 +# 记录错误日志 log_error = /var/log/mysql/error.log +# 指定传输数据包大小 max_allowed_packet = 1024M - +# 客户端高并发等待连接队列 +back_log = 2048 +# 移除 SQL92(ONLY_FULL_GROUP_BY) 标准使用GROUP BY函数查出来的列必须在包含在 GROUP BY 中 +sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION +# 日志保留30天 +expire_logs_days = 30 +# 记录查询日志 +slow_query_log_file = /var/log/mysql/mysql-slow.log +# 启用慢查询日志记录 +slow_query_log = 1 +# 指定超过1秒为慢查询 +long_query_time = 1 +# 缓冲池大小 +innodb_buffer_pool_size = 2G +# I/O 写入的线程数量 +innodb_write_io_threads = 8 +# I/O 读取的线程数量 +innodb_read_io_threads = 24 +# 缓冲池的实例数 +innodb_buffer_pool_instances=32 diff --git a/docker-cloud/nacos/.env.development b/docker-cloud/nacos/.env.development index 7dae989d..e3e66de9 100644 --- a/docker-cloud/nacos/.env.development +++ b/docker-cloud/nacos/.env.development @@ -2,9 +2,9 @@ MODE=standalone PREFER_HOST_MODE=hostname NACOS_APPLICATION_PORT=8848 SPRING_DATASOURCE_PLATFORM=mysql -MYSQL_SERVICE_HOST=47.111.191.224 +MYSQL_SERVICE_HOST=139.9.72.189 MYSQL_SERVICE_DB_NAME=kicc_config -MYSQL_SERVICE_PORT=3306 +MYSQL_SERVICE_PORT=8052 MYSQL_SERVICE_USER=u_kanglai_account MYSQL_SERVICE_PASSWORD='$kanglai.<2021>#' NACOS_AUTH_TOKEN_EXPIRE_SECONDS=18000 diff --git a/docker-cloud/nginx/Dockerfile b/docker-cloud/nginx/Dockerfile new file mode 100644 index 00000000..41b2418b --- /dev/null +++ b/docker-cloud/nginx/Dockerfile @@ -0,0 +1,9 @@ +FROM nginx + +COPY ./secret /secret + +RUN rm /etc/nginx/conf.d/default.conf + +ADD default.conf /etc/nginx/conf.d/ + +RUN /bin/bash -c 'echo init ok' diff --git a/docker-cloud/nginx/default.conf b/docker-cloud/nginx/default.conf new file mode 100644 index 00000000..1a02e3fb --- /dev/null +++ b/docker-cloud/nginx/default.conf @@ -0,0 +1,11 @@ +# 如果没有显式声明 default server 则第一个 server 会被隐式的设为 default server +server { + # 自定义访问端口 + listen 80; + # 服务名称 + server_name git.kanglailab.com; + location / { + proxy_pass http://localhost:8066; + } +} + diff --git a/docker-cloud/nginx/docker-compose.yaml b/docker-cloud/nginx/docker-compose.yaml new file mode 100644 index 00000000..9a7ac324 --- /dev/null +++ b/docker-cloud/nginx/docker-compose.yaml @@ -0,0 +1,16 @@ +# PROJECT: 康来生物有限公司kicc(智慧冷链)分布式架构平台 +# VERSION: 1.0.0 +# Author: 康来生物科技有限公司-王翔 + +version: '3' +services: + nginx: + build: + context: . + restart: always + container_name: nginx + image: nginx + network_mode: 'host' + ports: + - 80:80 + - 443:443