Skip to content

Commit

Permalink
[INLONG-2110] package inlong-manager-web as inlong-manager (apache#258)
Browse files Browse the repository at this point in the history
Co-authored-by: dockerzhang(张超) <dockerzhang@tencent.com>
  • Loading branch information
dockerzhang and dockerzhang committed Jan 20, 2022
1 parent 88ea700 commit a381c88
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions docs/deployment/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Requirements:

## Deploy

Manually copy SQL files from `inlong-manager/manager-web/sql` to the `docker/compose/sql` directory.
Manually copy SQL files from `inlong-manager/sql` to the `docker/compose/sql` directory.

```shell
cp inlong-manager/manager-web/sql/apache_inlong_manager.sql docker/docker-compose/sql
cp inlong-manager/sql/apache_inlong_manager.sql docker/docker-compose/sql
```

Then, start all components.
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/dashboard/quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ mvn package -DskipTests -Pdocker -pl inlong-dashboard

## Run
```
# MANAGER_API_ADDRESS must be replaced by inlong-manager-web address
# MANAGER_API_ADDRESS must be replaced by inlong-manager address
docker run -d --name dashboard -e MANAGER_API_ADDRESS=127.0.0.1:8083 -p 80:80 inlong/dashboard
```
8 changes: 4 additions & 4 deletions docs/modules/manager/quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Deployment
## Environment Requirements
- Install and start MySQL 5.7+
- initialize database
there is `sql/apache_inlong_manager.sql` in `inlong-manager-web` directory, load this file through the
there is `sql/apache_inlong_manager.sql` in `inlong-manager` directory, load this file through the
following command to complete the initialization of the table structure and basic data

```shell
Expand All @@ -15,14 +15,14 @@ title: Deployment

## Deploy manager

manager-web is a background service that interacts with the front-end page.
manager is a background service that interacts with the front-end page.

### Modify configuration

Go to the decompressed `inlong-manager-web` directory and modify the `conf/application.properties` file:
Go to the decompressed `inlong-manager` directory and modify the `conf/application.properties` file:

```properties
# manager-web service port number
# manager service port number
server.port=8083
# The configuration file used is dev
Expand Down
2 changes: 1 addition & 1 deletion docs/quick_start/how_to_build.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ after compile successfully, you could find distribution file at `inlong-distribu
```
inlong-agent
inlong-dataproxy
inlong-manager-web
inlong-manager
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ sidebar_position: 2

## 部署

手动拷贝`inlong-manager/manager-web/sql`目录到`docker/compose/sql`目录.
手动拷贝`inlong-manager/sql`目录到`docker/compose/sql`目录.
```shell
cp inlong-manager/manager-web/sql/apache_inlong_manager.sql docker/docker-compose/sql
cp inlong-manager/sql/apache_inlong_manager.sql docker/docker-compose/sql
```

然后启动所有组件:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ mvn package -DskipTests -Pdocker -pl inlong-dashboard

## 运行
```
# MANAGER_API_ADDRESS 环境变量 使用inlong-manager-web 部署地址替换
# MANAGER_API_ADDRESS 环境变量 使用inlong-manager 部署地址替换
docker run -d --name dashboard -e MANAGER_API_ADDRESS=127.0.0.1:8083 -p 80:80 inlong/dashboard
```
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: 安装部署
## 环境准备
- 安装并启动 MySQL 5.7+
- 初始化数据库
`inlong-manager-web` 目录下有 `sql/apache_inlong_manager.sql`文件,通过下述命令加载此文件,完成表结构及基础数据的初始化:
`inlong-manager` 目录下有 `sql/apache_inlong_manager.sql`文件,通过下述命令加载此文件,完成表结构及基础数据的初始化:

```shell
# 通过用户名和密码,创建DB和表:
Expand All @@ -14,14 +14,14 @@ title: 安装部署

## 部署manager

manager-web 是与前端页面交互的后台服务。
manager 是与前端页面交互的后台服务。

### 修改配置

前往 `inlong-manager-web` 目录,修改 `conf/application.properties` 文件:
前往 `inlong-manager` 目录,修改 `conf/application.properties` 文件:

```properties
# manager-web 服务的端口号
# manager 服务的端口号
server.port=8083
# 默认使用的配置文件为 dev
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $ docker run -v `pwd`:/inlong -w /inlong maven:3.6-openjdk-8 mvn clean install
```
inlong-agent
inlong-dataproxy
inlong-manager-web
inlong-manager
inlong-sort
inlong-tubemq-manager
inlong-tubemq-server
Expand Down

0 comments on commit a381c88

Please sign in to comment.