1.0.0.0819d2

Former-commit-id: 3edbaee6bb7b52bd52620cfe12813443f2d29ff0
Former-commit-id: c5a2ef39fe79221e32e7e15855eba6815546fc2e

projects/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0818d1")]
+[assembly: AssemblyInformationalVersion("1.0.0.0819d2")]

publish/src/linux-x64/publish/backup/backup.sh

@@ -5,4 +5,5 @@ mkdir $folder
 mysqldump -uroot -proot  usercenter > $folder/usercenter.sql
 mysqldump -uroot -proot  iotcenter > $folder/iotcenter.sql
 mysqldump -uroot -proot  jobserver > $folder/jobserver.sql
-influxd backup -database iot -host localhost:8088 $folder/influxdb/
+influxd backup -database iot -host localhost:8088 $folder/influxdb/
+#influxd restore -portable /backup/backup_20200819_102543/influxdb/

publish/src/linux-x64/publish/backup/backup_upgrade.docker.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+mysqldump -P 3306 -uroot -proot -d usercenter > /root/publish/backup/usercenter_d.sql
+mysqldump -P 3306 -uroot -proot -d iotcenter > /root/publish/backup/iotcenter_d.sql
+mysqldump -P 3306 -uroot -proot -d jobserver > /root/publish/backup/jobserver_d.sql

publish/src/linux-x64/publish/backup/backup_upgrade.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+mysqldump -P 3606 -uroot -proot -t usercenter > /root/publish/backup/usercenter_t.sql
+mysqldump -P 3606 -uroot -proot -t iotcenter > /root/publish/backup/iotcenter_t.sql
+mysqldump -P 3606 -uroot -proot -t jobserver > /root/publish/backup/jobserver_t.sql

publish/src/linux-x64/publish/docker-compose.upgrade.yml

@@ -0,0 +1,102 @@
+version: "3.8"
+networks:
+    default:
+        driver: bridge
+        ipam:
+            config:
+                - subnet: 172.172.0.0/24
+services:
+#container management 
+    portainer:
+        image: portainer/portainer:1.24.1
+        restart: always
+        ports:
+            - 9002:9000
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
+            - ./docker/data/portainer:/data
+        networks:
+            default:
+                ipv4_address: 172.172.0.101
+#database server
+    mysql:
+        image: mysql:8.0.21
+        restart: always
+        environment:
+            - MYSQL_ROOT_PASSWORD=root
+            - MYSQL_DATABASE=jobserver
+        command: --default-authentication-plugin=mysql_native_password
+        ports:
+            - 3306:3306
+        volumes:
+            - ./docker/conf/mysql/my.cnf:/etc/my.cnf
+            - ./docker/data/mysql:/var/lib/mysql
+            - ./backup:/backup
+        healthcheck:
+            test: mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+            timeout: 10s
+            retries: 30
+        networks:
+            default:
+                ipv4_address: 172.172.0.30
+    influxdb:
+        image: influxdb:1.8.1
+        restart: always
+        environment:
+            TZ: "Asia/Shanghai"
+            INFLUXDB_ADMIN_ENABLED: "true"
+            INFLUXDB_ADMIN_USER: admin
+            INFLUXDB_ADMIN_PASSWORD: admin
+        ports:
+            - 8086:8086
+        volumes:
+            - ./docker/data/influxdb:/var/lib/influxdb
+            - ./backup:/backup
+        networks:
+            default:
+                ipv4_address: 172.172.0.50
+    usercenter:
+        image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
+        restart: always
+        environment:
+            - TZ=Asia/Shanghai
+            - ASPNETCORE_ENVIRONMENT=Docker
+        command: bash -c "chmod +x /UserCenter/UserCenter && cd /UserCenter && ./UserCenter"
+        depends_on:
+            - mysql
+        volumes:
+            - ./apps/UserCenter:/UserCenter
+            - ./docker/log/UserCenter:/UserCenter/logs
+        networks:
+            default:
+                ipv4_address: 172.172.0.70
+    iotcenter:
+        image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
+        restart: always
+        environment:
+            - TZ=Asia/Shanghai
+            - ASPNETCORE_ENVIRONMENT=Docker
+        command: bash -c "chmod +x /IoTCenter/IoTCenter && cd /IoTCenter && ./IoTCenter"
+        depends_on:
+            - mysql
+        volumes:
+            - ./apps/IoTCenter:/IoTCenter
+            - ./docker/log/IoTCenter:/IotCenter/logs
+        networks:
+            default:
+                ipv4_address: 172.172.0.80
+    jobserver:
+        image: mcr.microsoft.com/dotnet/core/runtime-deps:3.1-focal
+        restart: always
+        environment:
+            - TZ=Asia/Shanghai
+            - ASPNETCORE_ENVIRONMENT=Docker
+        command: bash -c "sleep 3 && chmod +x /JobServer/JobServer && cd /JobServer && ./JobServer"
+        depends_on:
+            - mysql
+        volumes:
+            - ./apps/JobServer:/JobServer
+            - ./docker/log/JobServer:/JobServer/logs
+        networks:
+            default:
+                ipv4_address: 172.172.0.90

publish/src/linux-x64/publish/docker-compose.yml

@@ -106,8 +106,10 @@ services:
             INFLUXDB_ADMIN_PASSWORD: admin
         ports:
             - 8086:8086
+            - 8088:8088
         volumes:
             - ./docker/data/influxdb:/var/lib/influxdb
+            - ./backup:/backup
         networks:
             default:
                 ipv4_address: 172.172.0.50
@@ -162,7 +164,7 @@ services:
             - 8080:8080
             - 1985:1985
         working_dir: /usr/local/srs
-        command: bash -c "./objs/srs -c ./conf/srs.conf"
+        command: bash -c "chmod +x ./objs/srs && ./objs/srs -c ./conf/srs.conf"
         volumes:
             - ./apps/srs:/usr/local/srs
         networks:

publish/src/linux-x64/publish/upgrade.cmd

@@ -0,0 +1 @@
+docker-compose -f docker-compose.upgrade.yml up --remove-orphans -d

publish/src/linux-x64/publish/upgrade.sh

@@ -0,0 +1 @@
+docker-compose -f docker-compose.upgrade.yml up --remove-orphans -d