Docker-compose deployment update to docker in docker (#508)

* 1.Docker-compose deployment update to docker in docker

2.Fixed a bug where make edgeimage failed in root directory

3.The emqx container is updated to v3.1.0 and supports emqx-storm configuration.

* Delete emqx storm config

* Modify emqx edge download link

* Modify emqx edge download link

* Remove extra lines and add optional values for arch and qemu_arch

5 files changed, 27 insertions, 19 deletions

diff --git a/build/edge/Dockerfile b/build/edge/Dockerfile
index 83a695cb3..694e9de56 100644
--- a/build/edge/Dockerfile
+++ b/build/edge/Dockerfile
@@ -1,5 +1,5 @@
 ARG BUILD_FROM=golang:1.12-alpine3.9
-ARG RUN_FROM=docker
+ARG RUN_FROM=docker:dind
 
 FROM ${BUILD_FROM} AS builder
 
diff --git a/build/edge/README.md b/build/edge/README.md
index 3919c99c2..8ad559e68 100644
--- a/build/edge/README.md
+++ b/build/edge/README.md
@@ -19,8 +19,8 @@ container and MQTT Broker, so make sure that docker engine listening on
   | cloudhub        | 0.0.0.0:10000                     |                            |
   | edgename        | edge-node                         |                            |
   | edge_core_image | kubeedge/edgecore:latest          |                            |
-  | arch            | amd64                             | Optional: amd64 \| arm64v8 |
-  | qemu_arch       | x86_64                            | Optional: x86_64 \| aarch  |
+  | arch            | amd64                             | Optional: amd64 \| arm64v8 \| arm32v7 \| i386 \| s390x |
+  | qemu_arch       | x86_64                            | Optional: x86_64 \| aarch64 \| arm \| i386 \| s390x  |
   | certpath        | /etc/kubeedge/certs               |                            |
   | certfile        | /etc/kubeedge/certs/edge.crt      |                            |
   | keyfile         | /etc/kubeedge/certs/edge.key      |                            |
@@ -34,7 +34,7 @@ container and MQTT Broker, so make sure that docker engine listening on
           qemu_arch=x86_64 \
           certpath=/etc/kubeedge/certs \
           certfile=/etc/kubeedge/certs/edge.crt \
-          keyfile=/etc/kubeedge/certs/edge.key
+          keyfile=/etc/kubeedge/certs/edge.key 
   ```
 
 + Build image
diff --git a/build/edge/README_zh.md b/build/edge/README_zh.md
index e0d3fd680..6981c79df 100644
--- a/build/edge/README_zh.md
+++ b/build/edge/README_zh.md
@@ -13,16 +13,16 @@
 
   以下参数如果不用修改则无需设置
 
-  | 参数名称        | 默认值                            | 备注                     |
-  | --------------- | --------------------------------- | ------------------------ |
-  | cloudhub        | 0.0.0.0:10000                     |                          |
-  | edgename        | edge-node                         |                          |
-  | edge_core_image | kubeedge/edgecore:latest          |                          |
-  | arch            | amd64                             | 可选值：amd64 \| arm64v8 |
-  | qemu_arch       | x86_64                            | 可选值：x86_64 \| aarch  |
-  | certpath        | /etc/kubeedge/certs               |                          |
-  | certfile        | /etc/kubeedge/certs/edge.crt      |                          |
-  | keyfile         | /etc/kubeedge/certs/edge.key      |                          |
+  | 参数名称            | 默认值                       | 备注                     |
+  | ------------------- | ---------------------------- | ------------------------ |
+  | cloudhub            | 0.0.0.0:10000                |                          |
+  | edgename            | edge-node                    |                          |
+  | edge_core_image     | kubeedge/edgecore:latest     |                          |
+  | arch                | amd64                        | 可选值：amd64 \| arm64v8 \| arm32v7 \| i386 \| s390x |
+  | qemu_arch           | x86_64                       | 可选值：x86_64 \| aarch64 \| arm \| i386 \| s390x  |
+  | certpath            | /etc/kubeedge/certs          |                          |
+  | certfile            | /etc/kubeedge/certs/edge.crt |                          |
+  | keyfile             | /etc/kubeedge/certs/edge.key |                          |
 
   ```shell
   ./run_daemon.sh set \
@@ -33,7 +33,7 @@
           qemu_arch=x86_64 \
           certpath=/etc/kubeedge/certs \
           certfile=/etc/kubeedge/certs/edge.crt \
-          keyfile=/etc/kubeedge/certs/edge.key
+          keyfile=/etc/kubeedge/certs/edge.key 
   ````
 
 + 编译容器镜像
diff --git a/build/edge/docker-compose.yaml b/build/edge/docker-compose.yaml
index 2071212ee..0b60c8a15 100644
--- a/build/edge/docker-compose.yaml
+++ b/build/edge/docker-compose.yaml
@@ -5,8 +5,14 @@ networks:
     driver: bridge
 
 services:
+  dind:
+    image: ${ARCH}/docker:dind
+    restart: always
+    privileged: true 
+    networks:
+      - kubeedge-bridge
   emqx:
-    image: emqx/emqx-edge:v3.0.1-${ARCH}
+    image: emqx/emqx-edge:v3.1.1-${ARCH}
     restart: always
     networks:
       - kubeedge-bridge
@@ -18,10 +24,11 @@ services:
        dockerfile: ./build/edge/Dockerfile
        args: 
         - BUILD_FROM=${ARCH}/golang:1.12-alpine3.9
-        - RUN_FROM=${ARCH}/alpine:3.9
+        - RUN_FROM=${ARCH}/docker:dind 
         - QEMU_ARCH=${QEMU_ARCH}
     depends_on:
       - emqx
+      - dind
     environment:
       mqtt.server: tcp://emqx:1883
       edgehub.websocket.url: wss://${CLOUDHUB}/e632aba927ea4ac2b575ec1603d56f10/${EDGENAME}/events 
@@ -29,11 +36,12 @@ services:
       edgehub.controller.node-id: ${EDGENAME}
       edgehub.websocket.certfile: ${CERTFILE} 
       edgehub.websocket.keyfile: ${KEYFILE}
+      edged.docker-address: tcp://dind:2375
+      DOCKER_HOST: tcp://dind:2375
     volumes:
       - ${CERTPATH}:/etc/kubeedge/certs:ro
       - /var/lib/edged:/var/lib/edged 
       - /var/lib/kubeedge:/var/lib/kubeedge
-      - /var/run/docker.sock:/var/run/docker.sock
     privileged: true
     deploy:
       resources:
diff --git a/build/edge/run_daemon.sh b/build/edge/run_daemon.sh
index 5f54ff04a..1e2f35cc1 100755
--- a/build/edge/run_daemon.sh
+++ b/build/edge/run_daemon.sh
@@ -96,7 +96,7 @@ docker_set(){
     #    qemu_arch=x86_64 \
     #    certpath=/etc/kubeedge/certs \
     #    certfile=/etc/kubeedge/certs/edge.crt \
-    #    keyfile=/etc/kubeedge/certs/edge.key
+    #    keyfile=/etc/kubeedge/certs/edge.key 
 
     ARGS=$@