From edefae0a1a8d082b914d00270936370a9c387a9e Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 9 Mar 2021 17:25:26 +0800 Subject: [PATCH] update Former-commit-id: 1437b9caacfc25aa3a566b653aa4c3ccc0bd6494 Former-commit-id: b154fcb76d9ac34d35f5e20c222838d0f8871542 --- publish/build.ps1 | 9 ++- publish/src/linux-x64/publish/.gitignore | 3 +- .../{docker => }/conf/gateway/nginx.conf | 0 .../publish/{docker => }/conf/mysql/my.cnf | 0 publish/src/linux-x64/publish/conf/nginx.conf | 78 ------------------- .../{docker => }/conf/platform/nginx.dev.conf | 0 .../{docker => }/conf/redis/redis.conf | 0 .../{docker => }/conf/srs/conf/srs.conf | 0 .../{docker => }/conf/srs/dev/srs.conf | 0 .../{docker => }/conf/website/nginx.conf | 0 .../publish/{start-dev.cmd => dev.cmd} | 0 .../publish/docker-compose.override.yml | 8 +- .../src/linux-x64/publish/docker-compose.yml | 30 +++---- publish/src/linux-x64/publish/install.txt | 8 +- .../publish/{conf => }/supervisord.conf | 0 15 files changed, 29 insertions(+), 107 deletions(-) rename publish/src/linux-x64/publish/{docker => }/conf/gateway/nginx.conf (100%) rename publish/src/linux-x64/publish/{docker => }/conf/mysql/my.cnf (100%) delete mode 100644 publish/src/linux-x64/publish/conf/nginx.conf rename publish/src/linux-x64/publish/{docker => }/conf/platform/nginx.dev.conf (100%) rename publish/src/linux-x64/publish/{docker => }/conf/redis/redis.conf (100%) rename publish/src/linux-x64/publish/{docker => }/conf/srs/conf/srs.conf (100%) rename publish/src/linux-x64/publish/{docker => }/conf/srs/dev/srs.conf (100%) rename publish/src/linux-x64/publish/{docker => }/conf/website/nginx.conf (100%) rename publish/src/linux-x64/publish/{start-dev.cmd => dev.cmd} (100%) rename publish/src/linux-x64/publish/{conf => }/supervisord.conf (100%) diff --git a/publish/build.ps1 b/publish/build.ps1 index b358ad69..be3a6df7 100644 --- a/publish/build.ps1 +++ b/publish/build.ps1 @@ -9,7 +9,14 @@ if(Test-Path dist) } echo 'copy src to dist' -Copy-Item ./src/* ./dist -Recurse -Exclude @('./src/docker/log/*','./src/docker/log/*','.gitignore','start-dev.cmd','docker-compose.override.yml','nginx.dev.conf') +Copy-Item ./src/* ./dist -Recurse -Exclude @('./src/linux-x64/publish/log/*','.gitignore','dev.cmd','docker-compose.override.yml','nginx.dev.conf') +Remove-Item ./dist/linux-x64/publish/log/* -recurse -force +Remove-Item ./dist/linux-x64/publish/data/* -recurse -force + +#$source = (Get-Item -Path './src').FullName +#$dest = (Get-Item -Path './dist').FullName +#$exclude = @('dev.cmd','docker-compose.override.yml','nginx.dev.conf') +#Get-ChildItem $source -Recurse -Exclude $exclude | where {$_.FullName -notlike (Get-Item -Path './src/linux-x64/publish/log/').FullName} | Copy-Item -Destination {Join-Path $dest $_.FullName.Substring($source.length)} echo 'copy project files to dist folder' Copy-Item ../projects/WebMVC/wwwroot ./dist/linux-x64/publish/apps/WebMVC/wwwroot -recurse diff --git a/publish/src/linux-x64/publish/.gitignore b/publish/src/linux-x64/publish/.gitignore index fdf42770..c225f2a6 100644 --- a/publish/src/linux-x64/publish/.gitignore +++ b/publish/src/linux-x64/publish/.gitignore @@ -1,4 +1,3 @@ .vscode log -docker/log -docker/data \ No newline at end of file +data \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf b/publish/src/linux-x64/publish/conf/gateway/nginx.conf similarity index 100% rename from publish/src/linux-x64/publish/docker/conf/gateway/nginx.conf rename to publish/src/linux-x64/publish/conf/gateway/nginx.conf diff --git a/publish/src/linux-x64/publish/docker/conf/mysql/my.cnf b/publish/src/linux-x64/publish/conf/mysql/my.cnf similarity index 100% rename from publish/src/linux-x64/publish/docker/conf/mysql/my.cnf rename to publish/src/linux-x64/publish/conf/mysql/my.cnf diff --git a/publish/src/linux-x64/publish/conf/nginx.conf b/publish/src/linux-x64/publish/conf/nginx.conf deleted file mode 100644 index 4753eaab..00000000 --- a/publish/src/linux-x64/publish/conf/nginx.conf +++ /dev/null @@ -1,78 +0,0 @@ -#user nobody; -worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; -events { - worker_connections 1024; -} - - -http { - include mime.types; - default_type application/octet-stream; - - sendfile on; - - keepalive_timeout 65; - - server { - listen 0.0.0.0:80; - server_name localhost; - - location / { - #proxy_set_header Host $host:$server_port; - if ($http_user_agent ~* "(mobile|android|ipad|iphone|ipod|tablet)") { - proxy_pass http://localhost:5002; - break; - } - proxy_pass http://localhost:5001/; - } - - location ^~ /dfs/ { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://localhost:9000/; - } - - location ^~ /live/ { - proxy_pass http://localhost:8080/live/; - } - - location ^~ /video/ { - proxy_pass http://localhost:8080/video/; - } - - location ^~ /influxdb/ { - proxy_pass http://localhost:8086/; - } - - location ^~ /UserCenter/ { - proxy_pass http://localhost:8010/UserCenter/; - } - - location ^~ /IoTCenter/ { - proxy_pass http://localhost:8011/IoTCenter/; - } - - location ^~ /IoTCenter/hub { - proxy_pass http://localhost:8011/IoTCenter/hub; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } - - location ^~ /JobServer/ { - proxy_pass http://localhost:8013/JobServer/; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -} \ No newline at end of file diff --git a/publish/src/linux-x64/publish/docker/conf/platform/nginx.dev.conf b/publish/src/linux-x64/publish/conf/platform/nginx.dev.conf similarity index 100% rename from publish/src/linux-x64/publish/docker/conf/platform/nginx.dev.conf rename to publish/src/linux-x64/publish/conf/platform/nginx.dev.conf diff --git a/publish/src/linux-x64/publish/docker/conf/redis/redis.conf b/publish/src/linux-x64/publish/conf/redis/redis.conf similarity index 100% rename from publish/src/linux-x64/publish/docker/conf/redis/redis.conf rename to publish/src/linux-x64/publish/conf/redis/redis.conf diff --git a/publish/src/linux-x64/publish/docker/conf/srs/conf/srs.conf b/publish/src/linux-x64/publish/conf/srs/conf/srs.conf similarity index 100% rename from publish/src/linux-x64/publish/docker/conf/srs/conf/srs.conf rename to publish/src/linux-x64/publish/conf/srs/conf/srs.conf diff --git a/publish/src/linux-x64/publish/docker/conf/srs/dev/srs.conf b/publish/src/linux-x64/publish/conf/srs/dev/srs.conf similarity index 100% rename from publish/src/linux-x64/publish/docker/conf/srs/dev/srs.conf rename to publish/src/linux-x64/publish/conf/srs/dev/srs.conf diff --git a/publish/src/linux-x64/publish/docker/conf/website/nginx.conf b/publish/src/linux-x64/publish/conf/website/nginx.conf similarity index 100% rename from publish/src/linux-x64/publish/docker/conf/website/nginx.conf rename to publish/src/linux-x64/publish/conf/website/nginx.conf diff --git a/publish/src/linux-x64/publish/start-dev.cmd b/publish/src/linux-x64/publish/dev.cmd similarity index 100% rename from publish/src/linux-x64/publish/start-dev.cmd rename to publish/src/linux-x64/publish/dev.cmd diff --git a/publish/src/linux-x64/publish/docker-compose.override.yml b/publish/src/linux-x64/publish/docker-compose.override.yml index ced32ae0..d8cbcdcf 100644 --- a/publish/src/linux-x64/publish/docker-compose.override.yml +++ b/publish/src/linux-x64/publish/docker-compose.override.yml @@ -3,18 +3,18 @@ version: "3.8" services: srs: volumes: - - ./docker/conf/srs/dev:/usr/local/srs/conf + - ./conf/srs/dev:/usr/local/srs/conf website: volumes: - - ../../../../projects/Platform/wwwroot:/root/nginx/html/desktop - - ../../../../projects/WebSPA/wwwroot:/root/nginx/html/mobile + - ../../../projects/Platform/wwwroot:/root/nginx/html/desktop + - ../../../projects/WebSPA/wwwroot:/root/nginx/html/mobile platform: image: nginx:1.18.0 restart: always environment: TZ: "Asia/Shanghai" volumes: - - ./docker/conf/platform/nginx.dev.conf:/etc/nginx/nginx.conf + - ./conf/platform/nginx.dev.conf:/etc/nginx/nginx.conf networks: default: ipv4_address: 172.172.0.80 \ 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 91f2deb6..4c24a711 100644 --- a/publish/src/linux-x64/publish/docker-compose.yml +++ b/publish/src/linux-x64/publish/docker-compose.yml @@ -14,7 +14,7 @@ services: - 9002:9000 volumes: - /var/run/docker.sock:/var/run/docker.sock - - ./docker/data/portainer:/data + - ./data/portainer:/data networks: default: ipv4_address: 172.172.0.101 @@ -28,10 +28,10 @@ services: - 80:80 - 443:443 volumes: - - ./docker/conf/website/nginx.conf:/etc/nginx/nginx.conf - - ./docker/conf/website/edusoa.pem:/etc/nginx/edusoa.pem - - ./docker/conf/website/edusoa.key:/etc/nginx/edusoa.key - - ./docker/log/website:/var/log/nginx + - ./conf/website/nginx.conf:/etc/nginx/nginx.conf +# - ./conf/website/edusoa.pem:/etc/nginx/edusoa.pem +# - ./conf/website/edusoa.key:/etc/nginx/edusoa.key + - ./log/website:/var/log/nginx - ./apps/WebMVC/wwwroot:/root/nginx/html/desktop - ./apps/WebSPA/wwwroot:/root/nginx/html/mobile networks: @@ -46,8 +46,8 @@ services: ports: - 8000:8000 volumes: - - ./docker/conf/gateway/nginx.conf:/etc/nginx/nginx.conf - - ./docker/log/gateway:/var/log/nginx + - ./conf/gateway/nginx.conf:/etc/nginx/nginx.conf + - ./log/gateway:/var/log/nginx networks: default: ipv4_address: 172.172.0.12 @@ -62,7 +62,7 @@ services: ports: - 9000:9000 volumes: - - ./docker/data/minio:/data + - ./data/minio:/data networks: default: ipv4_address: 172.172.0.20 @@ -77,8 +77,8 @@ services: ports: - 3306:3306 volumes: - - ./docker/conf/mysql/my.cnf:/etc/my.cnf - - ./docker/data/mysql:/var/lib/mysql + - ./conf/mysql/my.cnf:/etc/my.cnf + - ./data/mysql:/var/lib/mysql healthcheck: test: mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD timeout: 10s @@ -98,7 +98,7 @@ services: - 8086:8086 - 8088:8088 volumes: - - ./docker/data/influxdb:/var/lib/influxdb + - ./data/influxdb:/var/lib/influxdb networks: default: ipv4_address: 172.172.0.50 @@ -109,8 +109,8 @@ services: ports: - 6379:6379 volumes: - - ./docker/data/redis:/data - - ./docker/conf/redis/redis.conf:/usr/local/etc/redis/redis.conf + - ./data/redis:/data + - ./conf/redis/redis.conf:/usr/local/etc/redis/redis.conf command: redis-server /usr/local/etc/redis/redis.conf networks: default: @@ -124,8 +124,8 @@ services: - 8080:8080 - 1985:1985 volumes: - - ./docker/conf/srs/conf:/usr/local/srs/conf - - ./docker/data/srs:/usr/local/srs/objs/nginx/html/video + - ./conf/srs/conf:/usr/local/srs/conf + - ./data/srs:/usr/local/srs/objs/nginx/html/video networks: default: ipv4_address: 172.172.0.60 diff --git a/publish/src/linux-x64/publish/install.txt b/publish/src/linux-x64/publish/install.txt index 085cd5bb..a5027239 100644 --- a/publish/src/linux-x64/publish/install.txt +++ b/publish/src/linux-x64/publish/install.txt @@ -6,12 +6,6 @@ apt-get -y install supervisor mkdir -p /root/publish/logs mv /etc/supervisor/supervisord.conf /etc/supervisor/supervisord.conf.bk mv /root/publish/conf/supervisord.conf /etc/supervisor/supervisord.conf -chmod 777 /root/publish/apps/UserCenter/UserCenter -chmod 777 /root/publish/apps/IoTCenter/IoTCenter -chmod 777 /root/publish/apps/JobServer/JobServer -chmod 777 /root/publish/apps/WebMVC/WebMVC -chmod 777 /root/publish/apps/WebSPA/WebSPA -chmod 777 /root/publish/apps/srs/objs/srs +chmod 777 /root/publish/apps/Platform/Platform chmod 777 /root/publish/apps/srs/objs/ffmpeg/bin/ffmpeg -chmod 777 /root/publish/apps/minio/minio service supervisor restart diff --git a/publish/src/linux-x64/publish/conf/supervisord.conf b/publish/src/linux-x64/publish/supervisord.conf similarity index 100% rename from publish/src/linux-x64/publish/conf/supervisord.conf rename to publish/src/linux-x64/publish/supervisord.conf