You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/11/29 12:12:06 UTC

[incubator-inlong] branch master updated: [INLONG-1861][Improve] Update document for docker-compose (#1862)

This is an automated email from the ASF dual-hosted git repository.

gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b0bc7a  [INLONG-1861][Improve] Update document for docker-compose (#1862)
8b0bc7a is described below

commit 8b0bc7ae8cddc29fb85d05aea00ece629809c260
Author: healchow <he...@gmail.com>
AuthorDate: Mon Nov 29 20:12:01 2021 +0800

    [INLONG-1861][Improve] Update document for docker-compose (#1862)
    
    Co-authored-by: healchow <he...@gmail.com>
---
 docker/README.md                                   |  3 +-
 docker/docker-compose/README.md                    | 30 +++++++++++----
 .../test/resources/sql/apache_inlong_manager.sql   | 44 +++++++++++-----------
 3 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index e404cd3..f16c7d3 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -4,7 +4,8 @@ Requirements:
 - [Docker](https://docs.docker.com/engine/install/) 19.03.1+
 
 ### Build Images
-```
+
+```shell
 mvn clean package -DskipTests -Pdocker
 ```
 
diff --git a/docker/docker-compose/README.md b/docker/docker-compose/README.md
index c1ba41a..d2eb13a 100644
--- a/docker/docker-compose/README.md
+++ b/docker/docker-compose/README.md
@@ -1,23 +1,39 @@
-#### InLong Standalone Using Docker Compose
+## InLong Standalone Using Docker Compose
+
 Deploy all InLong module by Docker Compose, it's only available for development.
 
 Requirements:
+
 - [Docker](https://docs.docker.com/engine/install/) 19.03.1+
 - Docker Compose 1.29.2+
 
-##### Deploy
+### Deploy
+
+Manually copy SQL files from `inlong-manager/sql` to the `docker/compose/sql` directory.
+
+Or execute the following command to copy the file.
+
+```shell
+cp inlong-manager/sql/apache_inlong_manager.sql  docker/docker-compose/sql
 ```
+
+Then, start all components.
+
+```shell
 docker-compose up -d
 ```
 
-##### Use InLong
+### Use InLong
+
 After all containers run successfully, you can access `http://localhost` with default account:
-```
+
+```shell
 User: admin
 Password: inlong
 ```
 
-##### Destroy
-```
+### Destroy
+
+```shell
 docker-compose down
-```
\ No newline at end of file
+```
diff --git a/inlong-manager/manager-web/src/test/resources/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/src/test/resources/sql/apache_inlong_manager.sql
index 08b2320..99dbe3e 100644
--- a/inlong-manager/manager-web/src/test/resources/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/src/test/resources/sql/apache_inlong_manager.sql
@@ -71,27 +71,29 @@ CREATE TABLE `agent_sys_conf`
 DROP TABLE IF EXISTS `business`;
 CREATE TABLE `business`
 (
-    `id`              int(11)      NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
-    `inlong_group_id` varchar(128) NOT NULL COMMENT 'Business group id, filled in by the user, undeleted ones cannot be repeated',
-    `name`            varchar(128)          DEFAULT '' COMMENT 'Business name, English, numbers and underscore',
-    `cn_name`         varchar(256)          DEFAULT NULL COMMENT 'Chinese display name',
-    `description`     varchar(256)          DEFAULT '' COMMENT 'Business Introduction',
-    `middleware_type` varchar(10)           DEFAULT 'TUBE' COMMENT 'The middleware type of message queue, high throughput: TUBE, high consistency: PULSAR',
-    `mq_resource_obj` varchar(128) NOT NULL COMMENT 'MQ resource object, for Tube, its Topic, for Pulsar, its Namespace',
-    `daily_records`   int(11)               DEFAULT '10' COMMENT 'Number of access records per day, unit: 10,000 records per day',
-    `daily_storage`   int(11)               DEFAULT '10' COMMENT 'Access size by day, unit: GB per day',
-    `peak_records`    int(11)               DEFAULT '1000' COMMENT 'Access peak per second, unit: records per second',
-    `max_length`      int(11)               DEFAULT '10240' COMMENT 'The maximum length of a single piece of data, unit: Byte',
-    `schema_name`     varchar(128)          DEFAULT NULL COMMENT 'Data type, associated data_schema table',
-    `in_charges`      varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas',
-    `followers`       varchar(512)          DEFAULT NULL COMMENT 'List of names of business followers, separated by commas',
-    `status`          int(4)                DEFAULT '21' COMMENT 'Business status',
-    `is_deleted`      tinyint(1)            DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
-    `creator`         varchar(64)  NOT NULL COMMENT 'Creator name',
-    `modifier`        varchar(64)           DEFAULT NULL COMMENT 'Modifier name',
-    `create_time`     timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
-    `modify_time`     timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
-    `temp_view`       text                  DEFAULT NULL COMMENT 'Temporary view, used to save intermediate data that has not been submitted or approved after modification',
+    `id`                  int(11)      NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+    `inlong_group_id`     varchar(128) NOT NULL COMMENT 'Business group id, filled in by the user, undeleted ones cannot be repeated',
+    `name`                varchar(128)          DEFAULT '' COMMENT 'Business name, English, numbers and underscore',
+    `cn_name`             varchar(256)          DEFAULT NULL COMMENT 'Chinese display name',
+    `description`         varchar(256)          DEFAULT '' COMMENT 'Business Introduction',
+    `middleware_type`     varchar(10)           DEFAULT 'TUBE' COMMENT 'The middleware type of message queue, high throughput: TUBE, high consistency: PULSAR',
+    `queue_module`        VARCHAR(20)  NULL     DEFAULT 'parallel' COMMENT 'Queue model of Pulsar, parallel: multiple partitions, high throughput, out-of-order messages; serial: single partition, low throughput, and orderly messages',
+    `topic_partition_num` INT(4)       NULL     DEFAULT '3' COMMENT 'The number of partitions of Pulsar Topic, 1-20',
+    `mq_resource_obj`     varchar(128) NOT NULL COMMENT 'MQ resource object, for Tube, its Topic, for Pulsar, its Namespace',
+    `daily_records`       int(11)               DEFAULT '10' COMMENT 'Number of access records per day, unit: 10,000 records per day',
+    `daily_storage`       int(11)               DEFAULT '10' COMMENT 'Access size by day, unit: GB per day',
+    `peak_records`        int(11)               DEFAULT '1000' COMMENT 'Access peak per second, unit: records per second',
+    `max_length`          int(11)               DEFAULT '10240' COMMENT 'The maximum length of a single piece of data, unit: Byte',
+    `schema_name`         varchar(128)          DEFAULT NULL COMMENT 'Data type, associated data_schema table',
+    `in_charges`          varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas',
+    `followers`           varchar(512)          DEFAULT NULL COMMENT 'List of names of business followers, separated by commas',
+    `status`              int(4)                DEFAULT '21' COMMENT 'Business status',
+    `is_deleted`          tinyint(1)            DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+    `creator`             varchar(64)  NOT NULL COMMENT 'Creator name',
+    `modifier`            varchar(64)           DEFAULT NULL COMMENT 'Modifier name',
+    `create_time`         timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+    `modify_time`         timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+    `temp_view`           json                  DEFAULT NULL COMMENT 'Temporary view, used to save intermediate data that has not been submitted or approved after modification',
     PRIMARY KEY (`id`),
     UNIQUE KEY `unique_business` (`inlong_group_id`, `is_deleted`, `modify_time`)
 );