From 675b0aa38e93a55dd9856bdafde4fa05ef0f7aa5 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 19 Aug 2020 17:13:48 +0800 Subject: [PATCH] 1.0.0.0819d2 Former-commit-id: 3edbaee6bb7b52bd52620cfe12813443f2d29ff0 Former-commit-id: c5a2ef39fe79221e32e7e15855eba6815546fc2e --- projects/Version.cs | 2 +- .../src/linux-x64/publish/backup/backup.sh | 3 +- .../publish/backup/backup_upgrade.docker.sh | 4 + .../publish/backup/backup_upgrade.sh | 4 + .../publish/docker-compose.upgrade.yml | 102 ++++++++++++++++++ .../src/linux-x64/publish/docker-compose.yml | 4 +- publish/src/linux-x64/publish/upgrade.cmd | 1 + publish/src/linux-x64/publish/upgrade.sh | 1 + 8 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 publish/src/linux-x64/publish/backup/backup_upgrade.docker.sh create mode 100644 publish/src/linux-x64/publish/backup/backup_upgrade.sh create mode 100644 publish/src/linux-x64/publish/docker-compose.upgrade.yml create mode 100644 publish/src/linux-x64/publish/upgrade.cmd create mode 100644 publish/src/linux-x64/publish/upgrade.sh diff --git a/projects/Version.cs b/projects/Version.cs index 3ed47744..7ac302dc 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0818d1")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.0819d2")] \ No newline at end of file diff --git a/publish/src/linux-x64/publish/backup/backup.sh b/publish/src/linux-x64/publish/backup/backup.sh index 08de78df..170bd62e 100644 --- a/publish/src/linux-x64/publish/backup/backup.sh +++ b/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/ \ No newline at end of file +influxd backup -database iot -host localhost:8088 $folder/influxdb/ +#influxd restore -portable /backup/backup_20200819_102543/influxdb/ \ No newline at end of file diff --git a/publish/src/linux-x64/publish/backup/backup_upgrade.docker.sh b/publish/src/linux-x64/publish/backup/backup_upgrade.docker.sh new file mode 100644 index 00000000..769b8f50 --- /dev/null +++ b/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 diff --git a/publish/src/linux-x64/publish/backup/backup_upgrade.sh b/publish/src/linux-x64/publish/backup/backup_upgrade.sh new file mode 100644 index 00000000..0882a07c --- /dev/null +++ b/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 diff --git a/publish/src/linux-x64/publish/docker-compose.upgrade.yml b/publish/src/linux-x64/publish/docker-compose.upgrade.yml new file mode 100644 index 00000000..f129b23c --- /dev/null +++ b/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 \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml index 591038c0..399e9ad1 100644 --- a/publish/src/linux-x64/publish/docker-compose.yml +++ b/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: diff --git a/publish/src/linux-x64/publish/upgrade.cmd b/publish/src/linux-x64/publish/upgrade.cmd new file mode 100644 index 00000000..cd28621e --- /dev/null +++ b/publish/src/linux-x64/publish/upgrade.cmd @@ -0,0 +1 @@ +docker-compose -f docker-compose.upgrade.yml up --remove-orphans -d \ No newline at end of file diff --git a/publish/src/linux-x64/publish/upgrade.sh b/publish/src/linux-x64/publish/upgrade.sh new file mode 100644 index 00000000..cd28621e --- /dev/null +++ b/publish/src/linux-x64/publish/upgrade.sh @@ -0,0 +1 @@ +docker-compose -f docker-compose.upgrade.yml up --remove-orphans -d \ No newline at end of file