Browse Source

refactor(doc): docker image update

Signed-off-by: ngjaying <ngjaying@gmail.com>
ngjaying 3 years ago
parent
commit
125cecb0b4

+ 2 - 2
.github/workflows/run_fvt_tests.yaml

@@ -126,7 +126,7 @@ jobs:
           sudo ./get_helm.sh
           helm version
       - name: build kuiper for docker
-        run: sudo docker build --no-cache -t emqx/kuiper:$(git describe --tags --alway)-alpine -f deploy/docker/Dockerfile-alpine .
+        run: sudo docker build --no-cache -t lfedge/ekuiper:$(git describe --tags --alway)-alpine -f deploy/docker/Dockerfile-alpine .
       - name: run emqx on chart
         env:
           KUBECONFIG: "/etc/rancher/k3s/k3s.yaml"
@@ -148,7 +148,7 @@ jobs:
           version=$(git describe --tags --always)
           emqx_address=$(kubectl get svc --namespace default emqx -o jsonpath="{.spec.clusterIP}")
           
-          sudo docker save emqx/kuiper:$version-alpine -o kuier.tar.gz
+          sudo docker save lfedge/ekuiper:$version-alpine -o kuier.tar.gz
           sudo k3s ctr image import kuier.tar.gz
 
           sed -i -r "s/^appVersion: .*$/appVersion: \"${version}\"/g" deploy/chart/kuiper/Chart.yaml

+ 1 - 1
README-CN.md

@@ -1,6 +1,6 @@
 # LF Edge eKuiper - 超轻量物联网边缘数据分析软件
 [![GitHub Release](https://img.shields.io/github/release/lf-edge/ekuiper?color=brightgreen)](https://github.com/lf-edge/ekuiper/releases)
-[![Docker Pulls](https://img.shields.io/docker/pulls/emqx/kuiper)](https://hub.docker.com/r/emqx/kuiper)
+[![Docker Pulls](https://img.shields.io/docker/pulls/lfedge/ekuiper)](https://hub.docker.com/r/lfedge/ekuiper)
 [![Slack](https://img.shields.io/badge/Slack-LF%20Edge-39AE85?logo=slack)](https://join.slack.com/t/lfedge/shared_invite/zt-7kavdtmq-SeyFzM2CEABBcKYGEVCgkw)
 [![Twitter](https://img.shields.io/badge/Follow-EMQ-1DA1F2?logo=twitter)](https://twitter.com/EMQTech)
 [![问答社区](https://img.shields.io/badge/问答社区-Kuiper-yellow)](https://askemq.com/c/kuiper/)

+ 1 - 1
README.md

@@ -1,7 +1,7 @@
 # LF Edge eKuiper - An edge lightweight IoT data analytics software
 
 [![GitHub Release](https://img.shields.io/github/release/lf-edge/ekuiper?color=brightgreen)](https://github.com/lf-edge/ekuiper/releases)
-[![Docker Pulls](https://img.shields.io/docker/pulls/emqx/kuiper)](https://hub.docker.com/r/emqx/kuiper)
+[![Docker Pulls](https://img.shields.io/docker/pulls/lfedge/ekuiper)](https://hub.docker.com/r/lfedge/ekuiper)
 [![Slack](https://img.shields.io/badge/Slack-LF%20Edge-39AE85?logo=slack)](https://join.slack.com/t/lfedge/shared_invite/zt-7kavdtmq-SeyFzM2CEABBcKYGEVCgkw)
 [![Twitter](https://img.shields.io/badge/Follow-EMQ-1DA1F2?logo=twitter)](https://twitter.com/EMQTech)
 [![Community](https://img.shields.io/badge/Community-Kuiper-yellow?logo=github)](https://github.com/lf-edge/ekuiper/discussions)

+ 2 - 2
deploy/chart/kuiper/README.md

@@ -46,7 +46,7 @@ eKuiper can be deployed at k3s/k8s cluster through Helm chart. Below takes k3s a
       ```shell
       helm search kuiper
       NAME     		CHART VERSION	APP VERSION  	DESCRIPTION
-      emqx/kuiper	0.0.3	        0.0.3	        A lightweight IoT edge analytic software
+      lfedge/ekuiper	0.0.3	        0.0.3	        A lightweight IoT edge analytic software
       ```
 
 + By edit  `values.yaml` file or use command `helm install --set` to edit ``eKuiper Helm Chart`` configurations.
@@ -56,7 +56,7 @@ eKuiper can be deployed at k3s/k8s cluster through Helm chart. Below takes k3s a
   | Parameters                     | Descriptions                                         | Default Value            |
   | ------------------------------ | ---------------------------------------------------- | ------------------------ |
   | `replicaCount`                 | Deployed eKuiper instance number                      | 1                        |
-  | `image.repository`             | Docker image name                                    | emqx/kuiper              |
+  | `image.repository`             | Docker image name                                    | lfedge/ekuiper              |
   | `image.pullPolicy`             | Pull policy                                          | IfNotPresent             |
   | `service.type`  | Kubernetes Service type. |ClusterIP|
   | `service.kuiper`  | Port for eKuiper. |20498|

+ 2 - 2
deploy/chart/kuiper/README_zh.md

@@ -46,7 +46,7 @@ eKuiper 可以通过 Helm chart 部署在 k3s / k8s 集群上。下面以 k3s 
       ```shell
       $ helm search repo kuiper
       NAME       	CHART VERSION	APP VERSION	DESCRIPTION
-      emqx/kuiper	0.0.4        	0.0.4      	A lightweight IoT edge analytic software
+      lfedge/ekuiper	0.0.4        	0.0.4      	A lightweight IoT edge analytic software
       ```
 
 + 可以通过编辑 `values.yaml` 文件或使用 `helm install --set` 命令编辑 eKuiper Helm Chart 的配置
@@ -56,7 +56,7 @@ eKuiper 可以通过 Helm chart 部署在 k3s / k8s 集群上。下面以 k3s 
   | 参数                           | 描述                                | Default Value            |
   | ------------------------------ | ----------------------------------- | ------------------------ |
   | `replicaCount`                 | 部署eKuiper数量                      | 1                        |
-  | `image.repository`             | 拉取镜像名称                        | emqx/kuiper              |
+  | `image.repository`             | 拉取镜像名称                        | lfedge/ekuiper              |
   | `image.pullPolicy`             | 拉取镜像策略                        | IfNotPresent             |
   | `service.type`  | Kubernetes Service type. |ClusterIP|
   | `service.kuiper`  | eKuiper 端口 |20498|

+ 1 - 1
deploy/chart/kuiper/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: emqx/kuiper
+  repository: lfedge/ekuiper
   pullPolicy: IfNotPresent
 
 service:

File diff suppressed because it is too large
+ 11 - 11
deploy/docker/README.md


+ 1 - 1
docs/en_US/README.md

@@ -39,7 +39,7 @@ It can be run at various IoT edge use scenarios, such as real-time processing of
 
 - Management
 
-  - [A web based management dashboard](https://hub.docker.com/r/emqx/kuiper-manager) for nodes, plugins, streams & rules management
+  - [A web based management dashboard](https://hub.docker.com/r/lfedge/ekuiper-manager) for nodes, plugins, streams & rules management
   - Plugins, streams and rules management through CLI & REST API
   - Easily be integrate with [KubeEdge](https://github.com/kubeedge/kubeedge), [K3s](https://github.com/rancher/k3s) and [Baetyl](https://github.com/baetyl/baetyl), which bases Kubernetes
 

+ 1 - 1
docs/en_US/edgex/edgex_rule_engine_command.md

@@ -215,7 +215,7 @@ Let's suppose a service need following data format, while `value` field is read
 
 ```shell
 curl -X PUT \
-  http://edgex-core-command:59882/api/v1/device/${deviceId}/command/xyz \
+  http://edgex-core-command:59882/api/v2/device/name/${deviceName}/command \
   -H 'Content-Type: application/json' \
   -d '{"value":-75, "EnableRandomization_Bool": "true"}'
 ```

+ 5 - 5
docs/en_US/manager-ui/overview.md

@@ -15,8 +15,8 @@ From eKuiper version 0.9.1, whenever a new version of eKuiper is released, the c
 ## Architecture design
 
 * UI end: a visual interface, easy for users to operate
-* eKuiper-manager: Management console, which essentially is a reverse HTTP proxy service, providing the services of user management, permission verification. It can be deployed in the cloud or at the edge
-* eKuiper instance: managed eKuiper node instance, eKuiper-manager can manage multiple eKuiper nodes at the same time
+* Kuiper-manager: Management console, which essentially is a reverse HTTP proxy service, providing the services of user management, permission verification. It can be deployed in the cloud or at the edge
+* eKuiper instance: managed eKuiper node instance, Kuiper-manager can manage multiple eKuiper nodes at the same time
 
 ![construct](./resources/arch.png)
 
@@ -24,16 +24,16 @@ From eKuiper version 0.9.1, whenever a new version of eKuiper is released, the c
 
 ### Install eKuiper
 
-- Pull eKuiper's Docker image from [Docker Image Library](https://hub.docker.com/r/emqx/kuiper/tags). Since it is required to install the plugin in this article, you must use the `kuiper:0.9.1-slim` image (`kuiper:0.9.1-alpine` image is relatively small and easy to install, but due to the lack of some necessary library files, the plug-in cannot run normally. The `kuiper:0.9.1` image is the development version, which is suitable for use in the development phase).
+- Pull eKuiper's Docker image from [Docker Image Library](https://hub.docker.com/r/lfedge/ekuiper/tags). Since it is required to install the plugin in this article, you must use the `kuiper:0.9.1-slim` image (`kuiper:0.9.1-alpine` image is relatively small and easy to install, but due to the lack of some necessary library files, the plug-in cannot run normally. The `kuiper:0.9.1` image is the development version, which is suitable for use in the development phase).
 
   ```shell
-  docker pull emqx/kuiper:0.9.1-slim
+  docker pull lfedge/ekuiper:0.9.1-slim
   ```
 
 - Run the eKuiper container (for convenience, we will use the public MQTT server provided by [EMQ](https://www.emqx.io), and the address can be set by the `-e` option when running the container). If you want to access the eKuiper instance through the host, you can expose port 9081 by adding the `-p 9081:9081` parameter when starting the container.
 
   ```shell
-  # docker run -d --name kuiper -e MQTT_SOURCE__DEFAULT__SERVERS=[tcp://broker.emqx.io:1883] emqx/kuiper:0.9.1-slim
+  # docker run -d --name kuiper -e MQTT_SOURCE__DEFAULT__SERVERS=[tcp://broker.emqx.io:1883] lfedge/ekuiper:0.9.1-slim
   ```
   
   When the container is running, the MQTT server address can be set through the `-e` option, and the data is written to the MQTT source configuration file, which can be viewed by the following command:

+ 1 - 1
docs/en_US/plugins/functions/tensorflow_lite_tutorial.md

@@ -61,7 +61,7 @@ To use the plugin, we need to build it in the environment where eKuiper will run
 
 ### Install by pre-built zip
 
-If using eKuiper docker images with tags like 1.1.1 or 1.1.1-slim which are based on debian, we can install the pre-built labelImage plugin. For example, to install the plugin for eKuiper 1.1.2 in docker image emqx/kuiper:1.1.2-slim, the pre-built zip file locates in *https://www.emqx.io/downloads/kuiper-plugins/v1.1.2/debian/functions/labelImage_amd64.zip*. Run the rest command as below to install.
+If using eKuiper docker images with tags like 1.1.1 or 1.1.1-slim which are based on debian, we can install the pre-built labelImage plugin. For example, to install the plugin for eKuiper 1.1.2 in docker image lfedge/ekuiper:1.1.2-slim, the pre-built zip file locates in *https://www.emqx.io/downloads/kuiper-plugins/v1.1.2/debian/functions/labelImage_amd64.zip*. Run the rest command as below to install.
 
 ```shell
 POST http://{{eKuiperHost:eKuiperRestPort}}/plugins/functions

File diff suppressed because it is too large
+ 2 - 2
docs/en_US/plugins/plugins_tutorial.md


File diff suppressed because it is too large
+ 2 - 2
docs/en_US/quick_start_docker.md


+ 1 - 1
docs/en_US/rules/overview.md

@@ -62,7 +62,7 @@ The rule options can be defined globally in ``etc/kuiper.yaml`` under the ``rule
 
 - eKuiper provides embeded following 3 sources,
   - MQTT source, see  [MQTT source stream](./sources/mqtt.md) for more detailed info.
-  - EdgeX source by default is shipped in [docker images](https://hub.docker.com/r/emqx/kuiper), but NOT included in single download binary files, you use ``make pkg_with_edgex`` command to build a binary package that supports EdgeX source. Please see [EdgeX source stream](./sources/edgex.md) for more detailed info.
+  - EdgeX source by default is shipped in [docker images](https://hub.docker.com/r/lfedge/ekuiper), but NOT included in single download binary files, you use ``make pkg_with_edgex`` command to build a binary package that supports EdgeX source. Please see [EdgeX source stream](./sources/edgex.md) for more detailed info.
   - HTTP pull source, regularly pull the contents at user's specified interval time, see [here](./sources/http_pull.md) for more detailed info.
 - See [SQL](../sqls/overview.md) for more info of eKuiper SQL.
 - Sources can be customized, see [extension](../extension/overview.md) for more detailed info.

+ 60 - 42
docs/zh_CN/edgex/edgex_rule_engine_command.md

@@ -39,58 +39,76 @@ curl -X POST \
 ```
 
 由于这两个规则都会向设备`Random-UnsignedInteger-Device`
-发送控制命令,通过运行命令`curl http://localhost:59882/api/v1/device/name/Random-Boolean-Device | jq`可以获取该设备的可用命令列表。它将打印类似的输出,如下所示。
+发送控制命令,通过运行命令`curl http://127.0.0.1:59882/api/v2/device/name/Random-Boolean-Device | jq`可以获取该设备的可用命令列表。它将打印类似的输出,如下所示。
 
 ```json
 {
-  "id": "9b051411-ca20-4556-bd3e-7f52475764ff",
-  "name": "Random-Boolean-Device",
-  "adminState": "UNLOCKED",
-  "operatingState": "ENABLED",
-  "labels": [
-    "device-virtual-example"
-  ],
-  "commands": [
-    {
-      "created": 1589052044139,
-      "modified": 1589052044139,
-      "id": "28d88bb3-e280-46f7-949f-37cc411757f5",
-      "name": "Bool",
-      "get": {
-        "path": "/api/v1/device/{deviceId}/Bool",
-        "responses": [
+  "apiVersion": "v2",
+  "statusCode": 200,
+  "deviceCoreCommand": {
+    "deviceName": "Random-Boolean-Device",
+    "profileName": "Random-Boolean-Device",
+    "coreCommands": [
+      {
+        "name": "WriteBoolValue",
+        "set": true,
+        "path": "/api/v2/device/name/Random-Boolean-Device/WriteBoolValue",
+        "url": "http://edgex-core-command:59882",
+        "parameters": [
           {
-            "code": "200",
-            "expectedValues": [
-              "Bool"
-            ]
+            "resourceName": "Bool",
+            "valueType": "Bool"
           },
           {
-            "code": "503",
-            "description": "service unavailable"
+            "resourceName": "EnableRandomization_Bool",
+            "valueType": "Bool"
           }
-        ],
-        "url": "http://edgex-core-command:59882/api/v1/device/bcd18c02-b187-4f29-8265-8312dc5d794d/command/d6d3007d-c4ce-472f-a117-820b5410e498"
+        ]
       },
-      "put": {
-        "path": "/api/v1/device/{deviceId}/Bool",
-        "responses": [
+      {
+        "name": "WriteBoolArrayValue",
+        "set": true,
+        "path": "/api/v2/device/name/Random-Boolean-Device/WriteBoolArrayValue",
+        "url": "http://edgex-core-command:59882",
+        "parameters": [
           {
-            "code": "200"
+            "resourceName": "BoolArray",
+            "valueType": "BoolArray"
           },
           {
-            "code": "503",
-            "description": "service unavailable"
+            "resourceName": "EnableRandomization_BoolArray",
+            "valueType": "Bool"
+          }
+        ]
+      },
+      {
+        "name": "Bool",
+        "get": true,
+        "set": true,
+        "path": "/api/v2/device/name/Random-Boolean-Device/Bool",
+        "url": "http://edgex-core-command:59882",
+        "parameters": [
+          {
+            "resourceName": "Bool",
+            "valueType": "Bool"
+          }
+        ]
+      },
+      {
+        "name": "BoolArray",
+        "get": true,
+        "set": true,
+        "path": "/api/v2/device/name/Random-Boolean-Device/BoolArray",
+        "url": "http://edgex-core-command:59882",
+        "parameters": [
+          {
+            "resourceName": "BoolArray",
+            "valueType": "BoolArray"
           }
-        ],
-        "url": "http://edgex-core-command:59882/api/v1/device/bcd18c02-b187-4f29-8265-8312dc5d794d/command/d6d3007d-c4ce-472f-a117-820b5410e498",
-        "parameterNames": [
-          "Bool",
-          "EnableRandomization_Bool"
         ]
       }
-    }
-  ]
+    ]
+  }
 }
 ```
 
@@ -103,7 +121,7 @@ curl -X POST \
 
 ```shell
 curl -X PUT \
-  http://edgex-core-command:59882/api/v1/device/c1459444-79bd-46c8-8b37-d6e1418f2a3a/command/fe202437-236d-41c5-845e-3e6013b928cd \
+  http://edgex-core-command:59882/api/v2/device/name/Random-Boolean-Device/WriteBoolValue \
   -H 'Content-Type: application/json' \
   -d '{"Bool":"true", "EnableRandomization_Bool": "true"}'
 ```
@@ -126,7 +144,7 @@ curl -X POST \
   "actions": [
     {
       "rest": {
-        "url": "http://edgex-core-command:59882/api/v1/device/bcd18c02-b187-4f29-8265-8312dc5d794d/command/d6d3007d-c4ce-472f-a117-820b5410e498",
+        "url": "http://edgex-core-command:59882/api/v2/device/name/Random-Boolean-Device/WriteBoolValue",
         "method": "put",
         "retryInterval": -1,
         "dataTemplate": "{\"Bool\":\"true\", \"EnableRandomization_Bool\": \"true\"}",
@@ -156,7 +174,7 @@ curl -X POST \
   "actions": [
     {
       "rest": {
-        "url": "http://edgex-core-command:59882/api/v1/device/bcd18c02-b187-4f29-8265-8312dc5d794d/command/d6d3007d-c4ce-472f-a117-820b5410e498",
+        "url": "http://edgex-core-command:59882/api/v2/device/name/Random-Boolean-Device/WriteBoolValue",
         "method": "put",
         "retryInterval": -1,
         "dataTemplate": "{\"Bool\":\"false\", \"EnableRandomization_Bool\": \"false\"}",
@@ -194,7 +212,7 @@ SQL的输出内容如下:
 
 ```shell
 curl -X PUT \
-  http://edgex-core-command:59882/api/v1/device/${deviceId}/command/xyz \
+  http://edgex-core-command:59882/api/v2/device/name/${deviceName}/command \
   -H 'Content-Type: application/json' \
   -d '{"value":-75, "EnableRandomization_Bool": "true"}'
 ```

+ 14 - 15
docs/zh_CN/edgex/edgex_rule_engine_tutorial.md

@@ -57,21 +57,20 @@ eKuiper v1.2.1 之后的版本将仅支持 EdgeX v2 ( Ireland 及之后的版本
 
 ```shell
 $ docker ps
-CONTAINER ID        IMAGE                                                                  COMMAND                  CREATED             STATUS              PORTS                                                                                              NAMES
-5618c93027a9        nexus3.edgexfoundry.org:10004/docker-device-virtual-go:master          "/device-virtual --p…"   37 minutes ago      Up 37 minutes       0.0.0.0:49990->49990/tcp                                                                           edgex-device-virtual
-fabe6b9052f5        nexus3.edgexfoundry.org:10004/docker-edgex-ui-go:master                "./edgex-ui-server"      37 minutes ago      Up 37 minutes       0.0.0.0:4000->4000/tcp                                                                             edgex-ui-go
-950135a7041d        emqx/kuiper:0.3.1                                                      "/usr/bin/docker-ent…"   37 minutes ago      Up 37 minutes        0.0.0.0:20498->20498/tcp, 9081/tcp, 0.0.0.0:59720->59720/tcp                                       edgex-kuiper
-c49b0d6f9347        nexus3.edgexfoundry.org:10004/docker-support-scheduler-go:master       "/support-scheduler …"   37 minutes ago      Up 37 minutes       0.0.0.0:48085->48085/tcp                                                                           edgex-support-scheduler
-4265dcc2bb48        nexus3.edgexfoundry.org:10004/docker-core-command-go:master            "/core-command -cp=c…"   37 minutes ago      Up 37 minutes       0.0.0.0:59882->59882/tcp                                                                           edgex-core-command
-4667160e2f41        nexus3.edgexfoundry.org:10004/docker-app-service-configurable:master   "/app-service-config…"   37 minutes ago      Up 37 minutes       48095/tcp, 0.0.0.0:48100->48100/tcp                                                                edgex-app-service-configurable-rules
-9bbfe95993f5        nexus3.edgexfoundry.org:10004/docker-core-metadata-go:master           "/core-metadata -cp=…"   37 minutes ago      Up 37 minutes       0.0.0.0:48081->48081/tcp, 59882/tcp                                                                edgex-core-metadata
-2e342a3aae81        nexus3.edgexfoundry.org:10004/docker-support-notifications-go:master   "/support-notificati…"   37 minutes ago      Up 37 minutes       0.0.0.0:48060->48060/tcp                                                                           edgex-support-notifications
-3cfc628e013a        nexus3.edgexfoundry.org:10004/docker-sys-mgmt-agent-go:master          "/sys-mgmt-agent -cp…"   37 minutes ago      Up 37 minutes       0.0.0.0:48090->48090/tcp                                                                           edgex-sys-mgmt-agent
-f69e9c4d6cc8        nexus3.edgexfoundry.org:10004/docker-core-data-go:master               "/core-data -cp=cons…"   37 minutes ago      Up 37 minutes       0.0.0.0:5563->5563/tcp, 0.0.0.0:48080->48080/tcp                                                   edgex-core-data
-9e5091928409        nexus3.edgexfoundry.org:10004/docker-support-logging-go:master         "/support-logging -c…"   37 minutes ago      Up 37 minutes       0.0.0.0:48061->48061/tcp                                                                           edgex-support-logging
-74e8668f892c        redis:5.0.7-alpine                                                     "docker-entrypoint.s…"   37 minutes ago      Up 37 minutes       0.0.0.0:6379->6379/tcp                                                                             edgex-redis
-9b341bb217f9        consul:1.3.1                                                           "docker-entrypoint.s…"   37 minutes ago      Up 37 minutes       0.0.0.0:8400->8400/tcp, 8300-8302/tcp, 8301-8302/udp, 8600/tcp, 8600/udp, 0.0.0.0:8500->8500/tcp   edgex-core-consul
-ed7ad5ae08b2        nexus3.edgexfoundry.org:10004/docker-edgex-volume:master               "/bin/sh -c '/usr/bi…"   37 minutes ago      Up 37 minutes                                                                                                          edgex-files
+CONTAINER ID   IMAGE                                                           COMMAND                  CREATED
+ STATUS          PORTS                                                                                  NAMES
+c7cb2c07dc4f   nexus3.edgexfoundry.org:10004/device-virtual:latest             "/device-virtual --c…"   13 minutes ago   Up 13 minutes   127.0.0.1:59900->59900/tcp                                                             edgex-device-virtual
+d7089087c301   nexus3.edgexfoundry.org:10004/device-rest:latest                "/device-rest --cp=c…"   13 minutes ago   Up 13 minutes   127.0.0.1:59986->59986/tcp                                                             edgex-device-rest
+32cd339157e2   nexus3.edgexfoundry.org:10004/app-service-configurable:latest   "/app-service-config…"   13 minutes ago   Up 13 minutes   48095/tcp, 127.0.0.1:59701->59701/tcp                                                  edgex-app-rules-engine
+62c2174d4b45   nexus3.edgexfoundry.org:10004/sys-mgmt-agent:latest             "/sys-mgmt-agent -cp…"   13 minutes ago   Up 13 minutes   127.0.0.1:58890->58890/tcp                                                             edgex-sys-mgmt-agent
+5b9f9cfb4307   nexus3.edgexfoundry.org:10004/core-data:latest                  "/core-data -cp=cons…"   13 minutes ago   Up 13 minutes   127.0.0.1:5563->5563/tcp, 127.0.0.1:59880->59880/tcp                                   edgex-core-data
+b455b06e2e7c   nexus3.edgexfoundry.org:10004/core-command:latest               "/core-command -cp=c…"   13 minutes ago   Up 13 minutes   127.0.0.1:59882->59882/tcp                                                             edgex-core-command
+6de994ce09d6   nexus3.edgexfoundry.org:10004/core-metadata:latest              "/core-metadata -cp=…"   13 minutes ago   Up 13 minutes   127.0.0.1:59881->59881/tcp                                                             edgex-core-metadata
+1b62bf57dd34   nexus3.edgexfoundry.org:10004/support-notifications:latest      "/support-notificati…"   13 minutes ago   Up 13 minutes   127.0.0.1:59860->59860/tcp                                                             edgex-support-notifications
+38776815a286   nexus3.edgexfoundry.org:10004/support-scheduler:latest          "/support-scheduler …"   13 minutes ago   Up 13 minutes   127.0.0.1:59861->59861/tcp                                                             edgex-support-scheduler
+5176ddff9f08   emqx/kuiper:1.2.1-alpine                                        "/usr/bin/docker-ent…"   13 minutes ago   Up 13 minutes   9081/tcp, 20498/tcp, 127.0.0.1:59720->59720/tcp                                        edgex-kuiper
+c78419bc5096   consul:1.9.5                                                    "docker-entrypoint.s…"   13 minutes ago   Up 13 minutes   8300-8302/tcp, 8301-8302/udp, 8600/tcp, 8600/udp, 127.0.0.1:8500->8500/tcp             edgex-core-consul
+d4b236a7b561   redis:6.2.4-alpine                                              "docker-entrypoint.s…"   13 minutes ago   Up 13 minutes   127.0.0.1:6379->6379/tcp                                                               edgex-redis
 ```
 
 ### 原生 (native) 方式运行

+ 4 - 4
docs/zh_CN/manager-ui/overview.md

@@ -15,7 +15,7 @@
 ## 架构设计
 
 * UI 端:可视化的界面,便于用户操作
-* eKuiper-manager:管理控制台,本质是一个反向 HTTP 代理服务,提供用户管理,权限验证等服务。既可以部署在云端,也可以部署在边缘端
+* Kuiper-manager:管理控制台,本质是一个反向 HTTP 代理服务,提供用户管理,权限验证等服务。既可以部署在云端,也可以部署在边缘端
 * eKuiper 实例,被管理的 eKuiper 节点实例,Kuiper-manager 可以同时管理多个 eKuiper 节点
 
 ![construct](./resources/arch.png)
@@ -24,16 +24,16 @@
 
 ### 安装 eKuiper
 
-- 从 [Docker 镜像库](https://hub.docker.com/r/emqx/kuiper/tags)拉取 eKuiper 的 Docker 镜像。由于本文中要安装插件,必须使用`kuiper:0.9.1-slim`镜像(`kuiper:0.9.1-alpine` 镜像比较小,安装比较方便,但是由于缺少一些必要的库文件,插件无法正常运行;而 `kuiper:0.9.1` 镜像是开发版本的镜像,适合于开发阶段使用)。
+- 从 [Docker 镜像库](https://hub.docker.com/r/lfedge/ekuiper/tags)拉取 eKuiper 的 Docker 镜像。由于本文中要安装插件,必须使用`kuiper:0.9.1-slim`镜像(`kuiper:0.9.1-alpine` 镜像比较小,安装比较方便,但是由于缺少一些必要的库文件,插件无法正常运行;而 `kuiper:0.9.1` 镜像是开发版本的镜像,适合于开发阶段使用)。
 
   ```shell
-  docker pull emqx/kuiper:0.9.1-slim
+  docker pull lfedge/ekuiper:0.9.1-slim
   ```
 
 - 运行 eKuiper 容器(为了方便,我们将使用由 [EMQ](https://www.emqx.cn) 提供的公有 MQTT 服务器,在运行容器时可通过 `-e` 选项设置地址)。如果您想通过主机访问 eKuiper 实例,可以通过在启动容器的时候加入 `-p 9081:9081` 参数来暴露 9081 端口。
 
   ```shell
-  # docker run -d --name kuiper -e MQTT_SOURCE__DEFAULT__SERVERS=[tcp://broker.emqx.io:1883] emqx/kuiper:0.9.1-slim
+  # docker run -d --name kuiper -e MQTT_SOURCE__DEFAULT__SERVERS=[tcp://broker.emqx.io:1883] lfedge/ekuiper:0.9.1-slim
   ```
   
   在运行容器时通过 `-e` 选项设置了 MQTT 服务器地址,数据写到了 MQTT 源配置文件中,通过以下命令可以查看:

+ 1 - 1
docs/zh_CN/plugins/functions/tensorflow_lite_tutorial.md

@@ -61,7 +61,7 @@ var LabelImage = labelImage{
 
 ### 通过预构建的  zip 安装
 
-如果使用基于 debian 的带有 1.1.1 或 1.1.1-slim标签的 eKuiper docker 镜像,我们可以安装预构建的 labelImage插件。 例如,要在 docker image emqx/kuiper:1.1.2-slim 中安装 eKuiper 1.1.2 插件,则预构建的 zip 文件位于 *https://www.emqx.io/downloads/kuiper-plugins/v1.1.2/debian/functions/labelImage_amd64.zip*。 按如下所示运行 rest命令以进行安装。
+如果使用基于 debian 的带有 1.1.1 或 1.1.1-slim标签的 eKuiper docker 镜像,我们可以安装预构建的 labelImage插件。 例如,要在 docker image lfedge/ekuiper:1.1.2-slim 中安装 eKuiper 1.1.2 插件,则预构建的 zip 文件位于 *https://www.emqx.io/downloads/kuiper-plugins/v1.1.2/debian/functions/labelImage_amd64.zip*。 按如下所示运行 rest命令以进行安装。
 
 ```shell
 POST http://{{kuiperHost:kuiperRestPort}}/plugins/functions

File diff suppressed because it is too large
+ 2 - 2
docs/zh_CN/plugins/plugins_tutorial.md


+ 2 - 2
docs/zh_CN/quick_start_docker.md

@@ -1,11 +1,11 @@
 ## 5 分钟快速入门
 
-1. 从 `https://hub.docker.com/r/emqx/kuiper/tags` 拉取 eKuiper 的 Docker 镜像。在本教程中推荐使用 `alpine` 镜像(参考 [eKuiper Docker](https://hub.docker.com/r/emqx/kuiper) 的内容了解不同 eKuiper Docker 镜像的区别)。 
+1. 从 `https://hub.docker.com/r/lfedge/ekuiper/tags` 拉取 eKuiper 的 Docker 镜像。在本教程中推荐使用 `alpine` 镜像(参考 [eKuiper Docker](https://hub.docker.com/r/lfedge/ekuiper) 的内容了解不同 eKuiper Docker 镜像的区别)。 
 
 2. 设置 eKuiper 源为一个 MQTT 服务器。本例使用位于 `tcp://broker.emqx.io:1883` 的 MQTT 服务器, `broker.emqx.io` 是一个由 [EMQ](https://www.emqx.cn) 提供的公有 MQTT 服务器。
 
    ```shell
-   docker run -p 9081:9081 -d --name kuiper -e MQTT_SOURCE__DEFAULT__SERVERS=[tcp://broker.emqx.io:1883] emqx/kuiper:$tag
+   docker run -p 9081:9081 -d --name kuiper -e MQTT_SOURCE__DEFAULT__SERVERS=[tcp://broker.emqx.io:1883] lfedge/ekuiper:$tag
    ```
 
 3. 创建流(stream)- 流式数据的结构定义,类似于数据库中的表格类型定义。比如说要发送温度与湿度的数据到 `broker.emqx.io`,这些数据将会被在**本地运行的** eKuiper docker 实例中处理。以下的步骤将创建一个名字为 `demo` 的流,并且数据将会被发送至 `devices/device_001/messages` 主题,这里的 `device_001` 可以是别的设备,比如 `device_002`,所有的这些数据会被 `demo` 流订阅并处理。

+ 1 - 1
docs/zh_CN/rules/overview.md

@@ -62,7 +62,7 @@
 
 - eKuiper 支持以下 3 种内置源:
   - MQTT 源,有关更多详细信息,请参阅 [MQTT source stream](https://github.com/lf-edge/ekuiper/blob/master/docs/zh_CN/rules/sources/mqtt.md)。
-  - EdgeX 源缺省是包含在[容器镜像](https://hub.docker.com/r/emqx/kuiper)中发布的,但是没有包含在单独下载的二进制包中,您可以使用 `make pkg_with_edgex` 命令来编译出一个支持 EdgeX 源的程序。更多关于它的详细信息,请参考 [EdgeX source stream](https://github.com/lf-edge/ekuiper/blob/master/docs/zh_CN/rules/sources/edgex.md)。
+  - EdgeX 源缺省是包含在[容器镜像](https://hub.docker.com/r/lfedge/ekuiper)中发布的,但是没有包含在单独下载的二进制包中,您可以使用 `make pkg_with_edgex` 命令来编译出一个支持 EdgeX 源的程序。更多关于它的详细信息,请参考 [EdgeX source stream](https://github.com/lf-edge/ekuiper/blob/master/docs/zh_CN/rules/sources/edgex.md)。
   - HTTP 定时拉取源,按照用户指定的时间间隔,定时从 HTTP 服务器中拉取数据,更多详细信息,请参考[这里](https://github.com/lf-edge/ekuiper/blob/master/docs/zh_CN/rules/sources/http_pull.md) 。
 - 有关eKuiper SQL 的更多信息,请参阅 [SQL](https://github.com/lf-edge/ekuiper/blob/master/docs/zh_CN/sqls/overview.md)。
 - 可以自定义来源,请参阅 [extension](https://github.com/lf-edge/ekuiper/blob/master/docs/zh_CN/extension/overview.md)了解更多详细信息。