manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from lijiahangmax/dev

Browse Source 
🐳 更新 docker 配置.
This commit is contained in:
lijiahangmax
2024-05-17 17:35:27 +08:00
committed by GitHub
parent 8ff1ec35df 630291df46
commit 4523138864
5 changed files with 90 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
README.md
View File

@@ -1,27 +1,41 @@
<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" alt="logo" width="32" /></div> <div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" alt="logo" width="32" /></div>
<p style="margin-top: 12px" align="center"><b>高颜值、现代化的智能运维&轻量堡垒机平台。</b></p> <p style="margin-top: 12px" align="center"><b>一款高颜值、现代化的智能运维&轻量堡垒机平台。</b></p>
<p align="center"> <p align="center">
<a target="_blank" href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade"> <a target="_blank"
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality"/> style="text-decoration: none !important;"
href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://www.apache.org/licenses/LICENSE-2.0">
<img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://github.com/lijiahangmax/orion-visor/releases">
<img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://gitee.com/lijiahangmax/orion-visor/members">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
</a> </a>
<a target="_blank" href="https://www.apache.org/licenses/LICENSE-2.0">
<img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License"/>
</a>
<a target="_blank" href="https://github.com/lijiahangmax/orion-visor/releases">
<img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release"/>
</a>
<a target="_blank" href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star"/>
</a>
<a target="_blank" style="display: none;" href="https://gitee.com/lijiahangmax/orion-visor/members">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork"/>
</a>
<a target="_blank" href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor.svg?style=social" alt="star"/>
</a>
<a target="_blank" style="display: none;" href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor.svg?style=social" alt="star"/>
</a>
</p> </p>
------------------------------ ------------------------------

8
docker-compose.yml
View File

@@ -8,14 +8,13 @@ services:
- MYSQL_HOST=orion-visor-mysql - MYSQL_HOST=orion-visor-mysql
- MYSQL_PORT=3306 - MYSQL_PORT=3306
- MYSQL_DATABASE=orion_visor - MYSQL_DATABASE=orion_visor
- MYSQL_USER=orion - MYSQL_USER=root
- MYSQL_PASSWORD=Data@123456 - MYSQL_PASSWORD=Data@123456
- REDIS_HOST=orion-visor-redis - REDIS_HOST=orion-visor-redis
- REDIS_PASSWORD=Data@123456 - REDIS_PASSWORD=Data@123456
- SECRET_KEY=uQeacXV8b3isvKLK - SECRET_KEY=uQeacXV8b3isvKLK
volumes: 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/root-orion:/root/orion
- /data/orion-visor-space/docker-volumes/orion-visor-service/app:/root/orion/orion-visor
depends_on: depends_on:
- orion-visor-mysql - orion-visor-mysql
- orion-visor-redis - orion-visor-redis
@@ -42,8 +41,7 @@ services:
- REDIS_PASSWORD=Data@123456 - REDIS_PASSWORD=Data@123456
volumes: volumes:
- /data/orion-visor-space/docker-volumes/orion-visor-redis/data:/data - /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/redis.conf --requirepass $${REDIS_PASSWORD}"
command: sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass $${REDIS_PASSWORD}"
orion-visor-adminer: orion-visor-adminer:
image: adminer image: adminer
ports: ports:

4
docker/orion-visor-redis/Dockerfile
View File

@@ -1,2 +1,4 @@
FROM redis:6.0.16-alpine 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

56
docs/README.md
View File

@@ -1,27 +1,41 @@
<div align="center"><img src="./assert/logo.svg" alt="logo" width="32" /></div> <div align="center"><img src="./assert/logo.svg" alt="logo" width="32" /></div>
<p style="margin-top: 12px" align="center"><b>高颜值、现代化的智能运维&轻量堡垒机平台。</b></p> <p style="margin-top: 12px" align="center"><b>一款高颜值、现代化的智能运维&轻量堡垒机平台。</b></p>
<p align="center"> <p align="center">
<a target="_blank" href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade"> <a target="_blank"
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality"/> style="text-decoration: none !important;"
href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
<img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://www.apache.org/licenses/LICENSE-2.0">
<img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://github.com/lijiahangmax/orion-visor/releases">
<img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://gitee.com/lijiahangmax/orion-visor/members">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
</a>
<a target="_blank"
style="text-decoration: none !important;"
href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
</a> </a>
<a target="_blank" href="https://www.apache.org/licenses/LICENSE-2.0">
<img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License"/>
</a>
<a target="_blank" href="https://github.com/lijiahangmax/orion-visor/releases">
<img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release"/>
</a>
<a target="_blank" href="https://gitee.com/lijiahangmax/orion-visor/stargazers">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/star.svg?theme=dark" alt="star"/>
</a>
<a target="_blank" style="display: none;" href="https://gitee.com/lijiahangmax/orion-visor/members">
<img src="https://gitee.com/lijiahangmax/orion-visor/badge/fork.svg?theme=dark" alt="fork"/>
</a>
<a target="_blank" href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor.svg?style=social" alt="star"/>
</a>
<a target="_blank" style="display: none;" href="https://github.com/lijiahangmax/orion-visor">
<img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor.svg?style=social" alt="star"/>
</a>
</p> </p>
------------------------------ ------------------------------

21
docs/update/v2.0.0.md
View File

@@ -81,16 +81,16 @@ CREATE DATABASE IF NOT EXISTS `orion_visor` DEFAULT CHARACTER SET utf8mb4 COLLAT
```bash ```bash
# 可以使用 navicat 的数据迁移功能, 下面描述的是 bash 中执行, 注意下面的变量替换 # 可以使用 navicat 的数据迁移功能, 下面描述的是 bash 中执行, 注意下面的变量替换
mysql_container_id=ea98e84527f6; mysql_container_id=ea98e84527f6
# 进入容器 # 进入容器
docker exec -it $mysql_container_id /bin/sh docker exec -it $mysql_container_id /bin/sh
mysql_username=root; mysql_username=root
mysql_password=Data@123456; mysql_password=Data@123456
# 导出数据 # 导出数据
mysqldump -u $mysql_username -p$mysql_password orion-ops-pro > /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; mysql -u $mysql_username -p$mysql_password orion_visor < /tmp/orion-ops-pro_dump.sql
# 等待数据导入完毕 建议在 5min 以上 # 等待数据导入完毕 建议在 5min 以上
sleep 300; sleep 300
# 删除 dump 文件 # 删除 dump 文件
rm -f /tmp/orion-ops-pro_dump.sql rm -f /tmp/orion-ops-pro_dump.sql
# 退出 # 退出
@@ -126,5 +126,12 @@ mv /data/orion-ops-pro-space /data/orion-visor-space
# 迁移 volumes # 迁移 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/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/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
``` ```