update Apphub Server v2.0.0

EdgeSolution · Dec 13, 2022 · d9b9bc8 · d9b9bc8
1 parent 9eb51fa
commit d9b9bc8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -79,4 +79,4 @@ SeverIP就是VM对外的公网IP地址。
 理论上，上述方法同样适用在各种Linux环境，甚至在云平台VM中安装AppHub，目前我们已经验证适用Azure和阿里云VM。
 | Release version  | DockerHub |    docker tag    |
 | :------------------- | :-------------- | :----------|
-|     V1.0.4        | edgesolution/apphub-manager:v1.0.4<br />edgesolution/apphub-emqx:v1.1<br />edgesolution/apphub-novnc:v1.2<br />edgesolution/apphub-postgres:v1.0<br />edgesolution/apphub-minio:v1.0 | eidevice/androiddm-javaenv-slim-dev:v5.3.0-release<br />eidevice/apphub-emqx-dev:v1.1.0<br />eidevice/apphub-novnc-dev:v1.0.0<br />eidevice/androiddm-postgres-dev:v1.1<br />eidevice/androiddm-minio-dev:v1.1<br /> |
+|     V2.0.0        | edgesolution/apphub-manager:v2.0.1<br />edgesolution/apphub-emqx:v1.2<br />edgesolution/apphub-novnc:v1.2<br />edgesolution/apphub-postgres:v1.0<br />edgesolution/apphub-minio:v1.0<br />edgesolution/apphub-ithings:v1.0<br />edgesolution/apphub-influxdb:v1.0 | eidevice/androiddm-javaenv-slim-dev:v5.4.5<br />eidevice/apphub-emqx-dev:v1.1.2<br />eidevice/apphub-novnc-dev:v1.0.0<br />eidevice/androiddm-postgres-dev:v1.1<br />eidevice/androiddm-minio-dev:v1.1<br />eidevice/apphub-ithings:v1.1.8<br />eidevice/influxdb-1.8:v1.0<br /> |
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
      androidlink: 
-        image: edgesolution/apphub-manager:v1.0.4
+        image: edgesolution/apphub-manager:v2.0.1
         restart: always
         depends_on:
                 - mqtt
@@ -14,7 +14,6 @@ services:
         ports:
                 - "8080:8080"
                 - "8081:8081"
-                - "8082:8082"
                 - "30001:30001"
         environment:
            TZ: "Asia/Shanghai"
@@ -29,12 +28,34 @@ services:
         container_name: apphub
         networks: 
                 - advnet
+     ithing:
+        image: edgesolution/apphub-ithings:v1.0
+        restart: always
+        depends_on:
+                - mqtt
+                - db
+                - influxDB
+                - androidlink
+        volumes:
+                - ./ithings/logs:/root/adv/ithings/logs
+        ports:
+                - "8082:8082"
+        environment:
+           LOG_PATH: "/root/adv/ithings/logs/ithings.log"
+           TZ: "Asia/Shanghai"
+        env_file:
+                - ./.env
+        command: /root/adv/run.sh
+        container_name: ithing
+        networks:
+                - advnet
      mqtt:
-        image: edgesolution/apphub-emqx:v1.1
+        image: edgesolution/apphub-emqx:v1.2
         restart: always
         ports: 
                 - "1883:1883"
                 - "18083:18083"
+                - "8083:8083"
         env_file:
                 - ./.env
         container_name: m2m_mosquitto
@@ -82,6 +103,18 @@ services:
         container_name: minio
         networks:
                 - advnet
+     influxDB:
+        image: edgesolution/apphub-influxdb:v1.0
+        restart: always
+        ports:
+                - "8086:8086"
+        volumes:
+                - ./influxdb:/var/lib/influxdb
+        env_file:
+                - ./.env
+        container_name: m2m-influxdb
+        networks:
+                - advnet
 networks:
     advnet:
         driver: bridge

diff --git a/start.sh b/start.sh
@@ -50,8 +50,8 @@ func_readip()
 
 func_startdocker()
 {
-	docker-compose -f docker-compose.yml up -d
-	sleep 15
+	docker-compose -f ./docker-compose.yml up -d
+	sleep 20
 	systemctl restart update-postgressql.service
 	systemctl restart work-eth-hotplug.service
 }