From 630291df4639ee97aa77420d712545ec39a2e02b Mon Sep 17 00:00:00 2001 From: lijiahang Date: Fri, 17 May 2024 17:23:43 +0800 Subject: [PATCH] =?UTF-8?q?:whale:=20=E6=9B=B4=E6=96=B0=20docker=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 56 ++++++++++++++++++----------- docker-compose.yml | 8 ++--- docker/orion-visor-redis/Dockerfile | 4 ++- docs/README.md | 56 ++++++++++++++++++----------- docs/update/v2.0.0.md | 21 +++++++---- 5 files changed, 90 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 7175c92e..fab9c48e 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,41 @@
logo
-

高颜值、现代化的智能运维&轻量堡垒机平台。

+

一款高颜值、现代化的智能运维&轻量堡垒机平台。

- - quality + + quality + + + License + + + release + + + star + + + fork + + + star + + + star - - License - - - release - - - star - - - fork - - - star - - - star -

------------------------------ diff --git a/docker-compose.yml b/docker-compose.yml index 7970ceef..85c48079 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,14 +8,13 @@ services: - MYSQL_HOST=orion-visor-mysql - MYSQL_PORT=3306 - MYSQL_DATABASE=orion_visor - - MYSQL_USER=orion + - MYSQL_USER=root - MYSQL_PASSWORD=Data@123456 - REDIS_HOST=orion-visor-redis - REDIS_PASSWORD=Data@123456 - SECRET_KEY=uQeacXV8b3isvKLK volumes: - - /data/orion-visor-space/docker-volumes/orion-visor-service/logs:/root/orion/logs/orion-visor - - /data/orion-visor-space/docker-volumes/orion-visor-service/app:/root/orion/orion-visor + - /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion depends_on: - orion-visor-mysql - orion-visor-redis @@ -42,8 +41,7 @@ services: - REDIS_PASSWORD=Data@123456 volumes: - /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data - - /data/orion-visor-space/docker-volumes/orion-visor-redis/usr-local-etc-redis:/usr/local/etc/redis - command: sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass $${REDIS_PASSWORD}" + command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}" orion-visor-adminer: image: adminer ports: diff --git a/docker/orion-visor-redis/Dockerfile b/docker/orion-visor-redis/Dockerfile index ea2134c2..a5685a08 100644 --- a/docker/orion-visor-redis/Dockerfile +++ b/docker/orion-visor-redis/Dockerfile @@ -1,2 +1,4 @@ FROM redis:6.0.16-alpine -COPY ./redis.conf /usr/local/etc/redis/redis.conf +WORKDIR /data +COPY ./redis.conf /tmp +RUN cat /tmp/redis.conf > /usr/local/redis.conf diff --git a/docs/README.md b/docs/README.md index e7f1cdcc..a54ce472 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,27 +1,41 @@
logo
-

高颜值、现代化的智能运维&轻量堡垒机平台。

+

一款高颜值、现代化的智能运维&轻量堡垒机平台。

- - quality + + quality + + + License + + + release + + + star + + + fork + + + star + + + star - - License - - - release - - - star - - - fork - - - star - - - star -

------------------------------ diff --git a/docs/update/v2.0.0.md b/docs/update/v2.0.0.md index 4112daed..ff9f5f7d 100644 --- a/docs/update/v2.0.0.md +++ b/docs/update/v2.0.0.md @@ -81,16 +81,16 @@ CREATE DATABASE IF NOT EXISTS `orion_visor` DEFAULT CHARACTER SET utf8mb4 COLLAT ```bash # 可以使用 navicat 的数据迁移功能, 下面描述的是 bash 中执行, 注意下面的变量替换 -mysql_container_id=ea98e84527f6; +mysql_container_id=ea98e84527f6 # 进入容器 docker exec -it $mysql_container_id /bin/sh -mysql_username=root; -mysql_password=Data@123456; +mysql_username=root +mysql_password=Data@123456 # 导出数据 -mysqldump -u $mysql_username -p$mysql_password orion-ops-pro > /tmp/orion-ops-pro_dump.sql; -mysql -u $mysql_username -p$mysql_password orion_visor < /tmp/orion-ops-pro_dump.sql; +mysqldump -u $mysql_username -p$mysql_password orion-ops-pro > /tmp/orion-ops-pro_dump.sql +mysql -u $mysql_username -p$mysql_password orion_visor < /tmp/orion-ops-pro_dump.sql # 等待数据导入完毕 建议在 5min 以上 -sleep 300; +sleep 300 # 删除 dump 文件 rm -f /tmp/orion-ops-pro_dump.sql # 退出 @@ -126,5 +126,12 @@ mv /data/orion-ops-pro-space /data/orion-visor-space # 迁移 volumes mv /data/orion-visor-space/docker-volumes/orion-ops-pro /data/orion-visor-space/docker-volumes/orion-visor-service mv /data/orion-visor-space/docker-volumes/mysql /data/orion-visor-space/docker-volumes/orion-visor-mysql -mv /data/orion-visor-space/docker-volumes/redis /data/orion-visor-space/docker-volumes/orion-visor-redis +# redis 的 volumes 直接删除 +rm -rf /data/orion-visor-space/docker-volumes/redis +# 合并 service 文件夹 +mkdir -p /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion/logs/orion-visor +mv /data/orion-visor-space/docker-volumes/orion-visor-service/logs/* /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion/logs/orion-visor +rm -rf /data/orion-visor-space/docker-volumes/orion-visor-service/logs +mv /data/orion-visor-space/docker-volumes/orion-visor-service/app /data/orion-visor-space/docker-volumes/orion-visor-service/orion-ops-pro +mv /data/orion-visor-space/docker-volumes/orion-visor-service/orion-ops-pro /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion ```