diff --git a/docker-compose.yml b/docker-compose.yml index cb2b67c6..f0abd2e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,27 +1,24 @@ version: '3.3' services: orion-ops: - build: - context: . - dockerfile: docker/orion-ops/Dockerfile - image: orion-ops:1.2.3 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.3 ports: - 1022:22 - 1080:80 environment: - MYSQL_HOST=orion-ops-db - - REDIS_HOST=orion-ops-redis - MYSQL_USER=orion - MYSQL_PASSWORD=Data@123456 + - REDIS_HOST=orion-ops-redis + - REDIS_PASSWORD=Data@123456 + - SECRET_KEY=orion_ops volumes: - /data/orion-ops-space/docker-volumes/root:/root depends_on: - orion-ops-db - orion-ops-redis orion-ops-db: - build: - context: . - dockerfile: docker/mysql/Dockerfile + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-mysql:latest privileged: true environment: - MYSQL_DATABASE=orion-ops @@ -34,7 +31,6 @@ services: - /data/orion-ops-space/docker-volumes/mysql/var-lib-mysql:/var/lib/mysql - /data/orion-ops-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files - /data/orion-ops-space/docker-volumes/mysql/etc-mysql:/etc/mysql - image: orion-ops-db:8.0 orion-adminer: image: adminer restart: always diff --git a/docs/advance/second-dev.md b/docs/advance/second-dev.md index 8d5fc052..5e3f6a0e 100644 --- a/docs/advance/second-dev.md +++ b/docs/advance/second-dev.md @@ -44,8 +44,10 @@ orion-ops/orion-ops-api/orion-ops-web/src/main/resources/application.properties ``` # 进入代码目录 cd orion-ops/orion-ops-vue +# 下载 yarn +npm i -g yarn # 下载依赖 -npm i 或 yarn +yarn install # 运行 npm run serve:dev ``` diff --git a/docs/quickstart/docker-install.md b/docs/quickstart/docker-install.md index ee321a8a..99016456 100644 --- a/docs/quickstart/docker-install.md +++ b/docs/quickstart/docker-install.md @@ -1,55 +1,10 @@ ### 所需环境 -* Docker -* Node 11.12.0(+) -* Maven 3.5.4(+) +* Docker 20.10.14+ +* Docker Compose 2.3.3+ -⚡ maven 推荐使用阿里云 mirror -⚡ npm 建议使用淘宝镜像 `npm config set registry https://registry.npmmirror.com/` - -### 编译Docker镜像 - -1. 拉取代码 - -``` -# github -git clone https://github.com/lijiahangmax/orion-ops -# gitee -git clone https://gitee.com/lijiahangmax/orion-ops -``` - -2. 构建后端代码 - -``` -# 修改全局加密秘钥, 为了密码安全考虑 (推荐修改) -orion-ops/orion-ops-api/orion-ops-web/src/main/resources/application.properties value.mix.secret.key -# 进入代码目录 -cd orion-ops/orion-ops-api -# 编译 -mvn -U clean install -DskipTests -``` - -3. 构建前端代码 - -``` -# 进入代码目录 -cd orion-ops/orion-ops-vue -# 下载依赖 -npm i 或 yarn -# 编译 -npm run build:prod -``` - -4. 构建 Docker 镜像 - -``` -# 进入仓库目录 -cd orion-ops -# 构建镜像 -docker compose build -``` - -由于访问 DockerHub 镜像比较慢, 可以修改一下配置加速镜像 /etc/docker/daemon.json, 如果没有此文件可以创建此文件 (Linux系统, Window 和 Mac 直接可以通过 Docker 的 Dashboard 修改) +由于访问 DockerHub 镜像比较慢, 可以修改一下配置加速镜像 /etc/docker/daemon.json, 如果没有此文件可以创建此文件 (Linux系统, Window 和 Mac 直接可以通过 Docker 的 +Dashboard 修改) ```json { @@ -62,13 +17,35 @@ docker compose build } ``` -5. 启动镜像 +### 拉取代码 + +``` +# github +git clone https://github.com/lijiahangmax/orion-ops +# gitee +git clone https://gitee.com/lijiahangmax/orion-ops +``` + +### 修改配置 + +``` +# 修改 docker-compose.yml +# REDIS_HOST redis 主机 +# REDIS_PASSWORD redis 密码 +# MYSQL_HOST mysql 主机 +# MYSQL_USER mysql 用户名 +# MYSQL_PASSWORD mysql 密码 +# SECRET_KEY 加密秘钥 +``` + +### 启动镜像 ``` docker compose up -d ``` -6. 连接 mysql (如果需要在 navicat 中连接) +### 连接 mysql (如果需要在 navicat 中连接) + ``` 访问 adminer: http://localhost:18080 服务器: orion-ops-db diff --git a/docs/quickstart/install.md b/docs/quickstart/install.md index 61bf51de..8fe3b2ec 100644 --- a/docs/quickstart/install.md +++ b/docs/quickstart/install.md @@ -48,8 +48,10 @@ mvn -U clean install -DskipTests ``` # 进入代码目录 cd orion-ops/orion-ops-vue +# 下载 yarn +npm i -g yarn # 下载依赖 -npm i 或 yarn +yarn install # 编译 npm run build:prod ``` diff --git a/orion-ops-api/orion-ops-web/src/main/resources/application.properties b/orion-ops-api/orion-ops-web/src/main/resources/application.properties index 83cf6438..9cd1670b 100644 --- a/orion-ops-api/orion-ops-web/src/main/resources/application.properties +++ b/orion-ops-api/orion-ops-web/src/main/resources/application.properties @@ -33,7 +33,7 @@ logging.logback.rollingpolicy.total-size-cap=0B # app app.version=1.2.3 login.token.header=O-Login-Token -value.mix.secret.key=orion_ops +value.mix.secret.key=${SECRET_KEY:orion_ops} # 全局日志打印切入点 log.interceptor.expression=execution (* com.orion.ops.controller.*.*(..)) && !@annotation(com.orion.ops.annotation.IgnoreLog) # 全局日志打印忽略字段