Bläddra i källkod

Merge branch 'master' of serset/Sers into develop

LithWang 1 år sedan
förälder
incheckning
10d32b1b29
76 ändrade filer med 49 tillägg och 1024 borttagningar
  1. 2 92
      .github/workflows/action-ki_multibranch.yml
  2. 0 46
      Publish/DevOps2/build-bash/40.Station-publish-multiple.bash
  3. 0 5
      Publish/DevOps2/environment/github-bash__publish-multiple-netcore-version.txt
  4. 0 23
      Publish/DevOps2/environment/readme.md
  5. 1 1
      Publish/DevOps3/build-bash/19.get-app-version.bash
  6. 1 1
      Publish/DevOps3/build-bash/20.change-app-version.bash
  7. 0 0
      Publish/DevOps3/build-bash/21.change-to-next-version.bash
  8. 0 0
      Publish/DevOps3/build-bash/22.add-suffix-to-app-version.bash
  9. 0 0
      Publish/DevOps3/build-bash/30.nuget-pack.sh
  10. 4 4
      Publish/DevOps3/build-bash/40.Station-publish.sh
  11. 1 1
      Publish/DevOps3/build-bash/41.extra-publish.sh
  12. 0 0
      Publish/DevOps3/build-bash/50.docker-image-copy.sh
  13. 0 0
      Publish/DevOps3/build-bash/51.docker-deploy-copy.sh
  14. 1 1
      Publish/DevOps3/build-bash/52.docker-extra-copy.sh
  15. 2 2
      Publish/DevOps3/build-bash/startup.bash
  16. 0 0
      Publish/DevOps3/build-cmd/30.nuget-pack.bat
  17. 0 0
      Publish/DevOps3/build-cmd/40.Station-publish(net5.0).bat
  18. 0 0
      Publish/DevOps3/build-cmd/40.Station-publish(netcoreapp2.1).bat
  19. 0 0
      Publish/DevOps3/build-cmd/40.Station-publish.bat
  20. 0 0
      Publish/DevOps3/build-cmd/41.StressTest-publish.bat
  21. 0 0
      Publish/DevOps3/build-cmd/50.docker-image-create.bat
  22. 0 0
      Publish/DevOps3/build-cmd/51.docker-deploy-copy.bat
  23. 0 0
      Publish/DevOps3/build-cmd/Clean-All.bat
  24. 0 0
      Publish/DevOps3/build-cmd/Clean-ReleaseFiles.bat
  25. 0 0
      Publish/DevOps3/build-cmd/OneKey Release.bat
  26. 0 0
      Publish/DevOps3/build-cmd/Version-To-NextTemp.bat
  27. 0 0
      Publish/DevOps3/build-cmd/Version-To-Preview.bat
  28. 0 0
      Publish/DevOps3/build-cmd/Version-To-Release.bat
  29. 0 0
      Publish/DevOps3/build-cmd/Version-getVersion.bat
  30. 0 0
      Publish/DevOps3/build-cmd/VsTool.exe
  31. 0 0
      Publish/DevOps3/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh
  32. 0 0
      Publish/DevOps3/environment/build-bash__41.extra-publish.sh
  33. 0 0
      Publish/DevOps3/environment/build-bash__52.docker-extra-copy.sh
  34. 0 0
      Publish/DevOps3/environment/env.APPNAME.txt
  35. 0 0
      Publish/DevOps3/environment/env.envName.txt
  36. 13 0
      Publish/DevOps3/environment/readme.md
  37. 1 1
      Publish/DevOps3/github-bash/74.github-push-to-webdav.sh
  38. 0 0
      Publish/DevOps3/github-bash/76.github-push-release.sh
  39. 8 10
      Publish/DevOps3/github-bash/startup.bash
  40. 8 8
      Publish/DevOps3/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile
  41. 0 0
      Publish/DevOps3/release-bash/71.file-zip.sh
  42. 0 0
      Publish/DevOps3/release-bash/72.nuget-push.sh
  43. 0 0
      Publish/DevOps3/release-bash/73.docker-image-build-push.sh
  44. 0 0
      Publish/DevOps3/release-bash/74.docker-image-build-push_amd64.bash
  45. 0 0
      Publish/DevOps3/release-bash/75.docker-image-build-push_cross.bash
  46. 0 0
      Publish/DevOps3/release-bash/78.push-releaseFiles-to-webdav.bash
  47. 7 7
      Publish/DevOps3/release-bash/startup.bash
  48. 0 32
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/docker导入导出镜像.txt
  49. 0 3
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/Dockerfile
  50. BIN
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/CGateway/Gateway
  51. 0 65
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/CGateway/appsettings.json
  52. 0 26
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/CGateway/readme.md
  53. 0 5
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/startup.sh
  54. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-robot/Dockerfile
  55. 0 3
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-robot/root/app/startup.sh
  56. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-sersall/Dockerfile
  57. 0 3
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-sersall/root/app/startup.sh
  58. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo/Dockerfile
  59. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo/root/app/startup.sh
  60. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gateway/Dockerfile
  61. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gateway/root/app/startup.sh
  62. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gover/Dockerfile
  63. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gover/root/app/startup.sh
  64. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers/Dockerfile
  65. 0 2
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers/root/app/startup.sh
  66. 0 87
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/制作镜像Sers.txt
  67. 0 48
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/制作镜像sers-cgateway-1.2.0.txt
  68. 0 65
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-cgateway/appsettings.json
  69. 0 58
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-cgateway/docker部署cgateway.txt
  70. 0 63
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-demo-robot/docker部署sers-demo-robot.txt
  71. 0 58
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-demo-sersall/docker部署sers-demo-sersall.txt
  72. 0 60
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-demo/docker部署sers-demo.txt
  73. 0 61
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-gateway/docker部署sers-gateway.txt
  74. 0 61
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-gover/docker部署sers-gover.txt
  75. 0 66
      Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers/docker部署sers.txt
  76. 0 38
      Publish/ReleaseFile/SersDocker(2021-05-19)/pack SersDocker.bat

+ 2 - 92
.github/workflows/action-ki_multibranch.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: ki_multibranch
+name: ki_multibranch_3.1
 
 # Controls when the action will run. 
 on:
@@ -44,7 +44,7 @@ jobs:
            export NUGET_KEY="${{ secrets.NUGET_KEY }}"
            export WebDav_BaseUrl="${{ secrets.WebDav_BaseUrl }}"
            export WebDav_User="${{ secrets.WebDav_User }}"
-           cd ./Publish/DevOps2/github-bash
+           cd ./Publish/DevOps3/github-bash
            bash startup.bash
            echo build succeed!
            
@@ -105,15 +105,6 @@ jobs:
         
         
         
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(net5.0)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-ServiceCenter-net5.0-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
       - uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -123,51 +114,6 @@ jobs:
           asset_name: ${{ env.appName }}-ServiceCenter-net6.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
 
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp2.1)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp2.1-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp2.2)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp2.2-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp3.0)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp3.0-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-ServiceCenter(netcoreapp3.1)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-ServiceCenter-netcoreapp3.1-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(net5.0)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-Station-net5.0-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
       - uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -176,39 +122,3 @@ jobs:
           asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(net6.0)-${{ env.release_version }}.zip
           asset_name: ${{ env.appName }}-Station-net6.0-${{ env.release_version }}.zip
           asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp2.1)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-Station-netcoreapp2.1-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp2.2)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-Station-netcoreapp2.2-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp3.0)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-Station-netcoreapp3.0-${{ env.release_version }}.zip
-          asset_content_type: application/zip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_create.outputs.upload_url }}
-          asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-Station(netcoreapp3.1)-${{ env.release_version }}.zip
-          asset_name: ${{ env.appName }}-Station-netcoreapp3.1-${{ env.release_version }}.zip
-          asset_content_type: application/zip

+ 0 - 46
Publish/DevOps2/build-bash/40.Station-publish-multiple.bash

@@ -1,46 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-# args
-args_="
-
-export basePath=/root/temp/svn
-export NUGET_PATH=$basePath/Publish/release/.nuget
-
-# "
-
-
-curPath=$PWD
-
-cd $curPath/../../..
-export basePath=$PWD
-cd $curPath
-
-#----------------------------------------------
-echo "40.Station-publish-multiple.bash"
-
-for netVersion in net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
-do
-	echo "#2.1 publish netVersion: $netVersion"
-
-	echo "#2.2 change netVersion to $netVersion in csproj"
-	sed -i 's/net6.0/'"$netVersion"'/g' `find ${basePath} -name *.csproj -exec grep '<publish>' -l {} \;`
-
-
-	echo "#2.3 sh 40.Station-publish.sh"
-	cd $curPath
-	sh 40.Station-publish.sh
-
-
-	echo "#2.4 change back netVersion to net6.0 in csproj"
-	sed -i 's/'"$netVersion"'/net6.0/g' `find ${basePath} -name *.csproj -exec grep '<publish>' -l {} \;`
-
-done
-
-
-
-cd $curPath
-
-
-

+ 0 - 5
Publish/DevOps2/environment/github-bash__publish-multiple-netcore-version.txt

@@ -1,5 +0,0 @@
-
-if this file exists, 
-will publish multiple netcore version 
-like net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
-in github actions 

+ 0 - 23
Publish/DevOps2/environment/readme.md

@@ -1,23 +0,0 @@
-
-
-
-# build-bash
-extra steps when building, all sh files could be remove if not needed.
-
-
-
-
-
-
-
-
-
-# github-bash__publish-multiple-netcore-version.txt
-if this file exists, 
-will publish multiple netcore version 
-like net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
-in github actions 
-
-
-
-

+ 1 - 1
Publish/DevOps2/build-bash/19.get-app-version.bash → Publish/DevOps3/build-bash/19.get-app-version.bash

@@ -1,7 +1,7 @@
 set -e
 
 # export versionSuffix='.1234.preview'
-# bash 20.change-release-version.bash
+# bash 19.get-app-version.bash
 
 
 #---------------------------------------------------------------------

+ 1 - 1
Publish/DevOps2/build-bash/20.change-app-version.bash → Publish/DevOps3/build-bash/20.change-app-version.bash

@@ -1,7 +1,7 @@
 set -e
 
 # export versionSuffix='.1234.preview'
-# bash 20.change-release-version.bash
+# bash 20.change-app-version.bash
 
 
 #---------------------------------------------------------------------

+ 0 - 0
Publish/DevOps2/build-bash/21.change-to-next-version.bash → Publish/DevOps3/build-bash/21.change-to-next-version.bash


+ 0 - 0
Publish/DevOps2/build-bash/22.add-suffix-to-app-version.bash → Publish/DevOps3/build-bash/22.add-suffix-to-app-version.bash


+ 0 - 0
Publish/DevOps2/build-bash/30.nuget-pack.sh → Publish/DevOps3/build-bash/30.nuget-pack.sh


+ 4 - 4
Publish/DevOps2/build-bash/40.Station-publish.sh → Publish/DevOps3/build-bash/40.Station-publish.sh

@@ -16,13 +16,13 @@ if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
 #----------------------------------------------
 echo "#40.Station-publish.sh -> find projects and build"
 
-
-
+export devOpsPath="$PWD/.."
 
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $NUGET_PATH:/root/.nuget \
--v $basePath:/root/code \
+-v "$basePath":/root/code \
+-v "$basePath":"$basePath" \
 serset/dotnet:sdk-6.0 \
 bash -c "
 set -e
@@ -72,7 +72,7 @@ fi
 
 
 #4 copy extra release files
-bashFile=\"\$basePath/Publish/DevOps2/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh\"
+bashFile=\"$devOpsPath/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh\"
 if [ -f \"\$bashFile\" ]; then
 	echo '#4 copy extra release files'
 	sh \"\$bashFile\"

+ 1 - 1
Publish/DevOps2/build-bash/41.extra-publish.sh → Publish/DevOps3/build-bash/41.extra-publish.sh

@@ -13,7 +13,7 @@ export NUGET_PATH=$basePath/Publish/release/.nuget
 
 #---------------------------------------------------------------------
 #41.extra-publish.sh
-bashFile="$basePath/Publish/DevOps2/environment/build-bash__41.extra-publish.sh"
+bashFile="$PWD/../environment/build-bash__41.extra-publish.sh"
 if [ -f "$bashFile" ]; then
 	echo '#41.extra-publish.sh'
 	sh "$bashFile"

+ 0 - 0
Publish/DevOps2/build-bash/50.docker-image-copy.sh → Publish/DevOps3/build-bash/50.docker-image-copy.sh


+ 0 - 0
Publish/DevOps2/build-bash/51.docker-deploy-copy.sh → Publish/DevOps3/build-bash/51.docker-deploy-copy.sh


+ 1 - 1
Publish/DevOps2/build-bash/52.docker-extra-copy.sh → Publish/DevOps3/build-bash/52.docker-extra-copy.sh

@@ -13,7 +13,7 @@ export NUGET_PATH=$basePath/Publish/release/.nuget
 
 #---------------------------------------------------------------------
 #52.docker-extra-copy.sh
-bashFile="$basePath/Publish/DevOps2/environment/build-bash__52.docker-extra-copy.sh"
+bashFile="$PWD/../environment/build-bash__52.docker-extra-copy.sh"
 if [ -f "$bashFile" ]; then
 	echo '#52.docker-extra-copy.sh'
 	sh "$bashFile"

+ 2 - 2
Publish/DevOps2/build-bash/startup.bash → Publish/DevOps3/build-bash/startup.bash

@@ -1,13 +1,13 @@
 set -e
 
-# cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/build-bash;bash startup.bash;
+# cd build-bash; bash startup.bash;
 
 #----------------------------------------------
 # cur path
 curPath=$PWD
 
 cd $curPath/../../..
-export basePath=$PWD
+export basePath="$PWD"
 cd $curPath
 
 

+ 0 - 0
Publish/DevOps2/build-cmd/30.nuget-pack.bat → Publish/DevOps3/build-cmd/30.nuget-pack.bat


+ 0 - 0
Publish/DevOps2/build-cmd/40.Station-publish(net5.0).bat → Publish/DevOps3/build-cmd/40.Station-publish(net5.0).bat


+ 0 - 0
Publish/DevOps2/build-cmd/40.Station-publish(netcoreapp2.1).bat → Publish/DevOps3/build-cmd/40.Station-publish(netcoreapp2.1).bat


+ 0 - 0
Publish/DevOps2/build-cmd/40.Station-publish.bat → Publish/DevOps3/build-cmd/40.Station-publish.bat


+ 0 - 0
Publish/DevOps2/build-cmd/41.StressTest-publish.bat → Publish/DevOps3/build-cmd/41.StressTest-publish.bat


+ 0 - 0
Publish/DevOps2/build-cmd/50.docker-image-create.bat → Publish/DevOps3/build-cmd/50.docker-image-create.bat


+ 0 - 0
Publish/DevOps2/build-cmd/51.docker-deploy-copy.bat → Publish/DevOps3/build-cmd/51.docker-deploy-copy.bat


+ 0 - 0
Publish/DevOps2/build-cmd/Clean-All.bat → Publish/DevOps3/build-cmd/Clean-All.bat


+ 0 - 0
Publish/DevOps2/build-cmd/Clean-ReleaseFiles.bat → Publish/DevOps3/build-cmd/Clean-ReleaseFiles.bat


+ 0 - 0
Publish/DevOps2/build-cmd/OneKey Release.bat → Publish/DevOps3/build-cmd/OneKey Release.bat


+ 0 - 0
Publish/DevOps2/build-cmd/Version-To-NextTemp.bat → Publish/DevOps3/build-cmd/Version-To-NextTemp.bat


+ 0 - 0
Publish/DevOps2/build-cmd/Version-To-Preview.bat → Publish/DevOps3/build-cmd/Version-To-Preview.bat


+ 0 - 0
Publish/DevOps2/build-cmd/Version-To-Release.bat → Publish/DevOps3/build-cmd/Version-To-Release.bat


+ 0 - 0
Publish/DevOps2/build-cmd/Version-getVersion.bat → Publish/DevOps3/build-cmd/Version-getVersion.bat


+ 0 - 0
Publish/DevOps2/build-cmd/VsTool.exe → Publish/DevOps3/build-cmd/VsTool.exe


+ 0 - 0
Publish/DevOps2/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh → Publish/DevOps3/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh


+ 0 - 0
Publish/DevOps2/environment/build-bash__41.extra-publish.sh → Publish/DevOps3/environment/build-bash__41.extra-publish.sh


+ 0 - 0
Publish/DevOps2/environment/build-bash__52.docker-extra-copy.sh → Publish/DevOps3/environment/build-bash__52.docker-extra-copy.sh


+ 0 - 0
Publish/DevOps2/environment/env.APPNAME.txt → Publish/DevOps3/environment/env.APPNAME.txt


+ 0 - 0
Publish/DevOps2/environment/env.envName.txt → Publish/DevOps3/environment/env.envName.txt


+ 13 - 0
Publish/DevOps3/environment/readme.md

@@ -0,0 +1,13 @@
+
+# DevOps 3.1
+> 2024-04-27
+
+# build-bash
+extra steps when building, all sh files could be remove if not needed.
+
+
+
+
+
+
+

+ 1 - 1
Publish/DevOps2/github-bash/74.github-push-to-webdav.sh → Publish/DevOps3/github-bash/74.github-push-to-webdav.sh

@@ -24,7 +24,7 @@ if [ -z "$WebDav_BaseUrl" ]; then
 	echo "github skip pushing release file to WebDav because invalid WebDav endpoint"
 else
 	echo "github push release file to WebDav"
-	bash $basePath/Publish/DevOps2/release-bash/78.push-releaseFiles-to-webdav.bash;
+	bash "$PWD/../release-bash/78.push-releaseFiles-to-webdav.bash";
 fi
 
 

+ 0 - 0
Publish/DevOps2/github-bash/76.github-push-release.sh → Publish/DevOps3/github-bash/76.github-push-release.sh


+ 8 - 10
Publish/DevOps2/github-bash/startup.bash → Publish/DevOps3/github-bash/startup.bash

@@ -1,6 +1,6 @@
 set -e
 
-# cd /root/temp/svn/Publish/DevOps2/github-bash;bash startup.bash;
+# cd github-bash; bash startup.bash;
 
 #---------------------------------------------------------------------
 # args
@@ -24,33 +24,31 @@ export WebDav_User="username:pwd"
 curPath=$PWD
 
 cd $curPath/../../..
-export basePath=$PWD
+export basePath="$PWD"
 cd $curPath
 
+export devOpsPath="$PWD/.."
+
 # export basePath=/root/temp/svn
 
 if [ ! $APPNAME ]; then 
-	export APPNAME=$(cat "$basePath/Publish/DevOps2/environment/env.APPNAME.txt" | tr -d '\n')
+	export APPNAME=$(cat "$devOpsPath/environment/env.APPNAME.txt" | tr -d '\n')
 	echo "APPNAME: [${APPNAME}]" 
 fi
 
 #---------------------------------------------- 
 echo '#1 build'
-cd $basePath/Publish/DevOps2/build-bash; bash startup.bash;
-
-if [ -f "$basePath/Publish/DevOps2/environment/github-bash__publish-multiple-netcore-version.txt" ]; then
-	cd $basePath/Publish/DevOps2/build-bash; bash 40.Station-publish-multiple.bash;
-fi
+cd "$devOpsPath/build-bash"; bash startup.bash;
 
 #---------------------------------------------- 
 echo '#2 release-bash'
-cd $basePath/Publish/DevOps2/release-bash; bash startup.bash;
+cd "$devOpsPath/release-bash"; bash startup.bash;
  
 
 
 #----------------------------------------------
 echo "#3 get appVersion" 
-cd $basePath/Publish/DevOps2/build-bash; source 19.get-app-version.bash;
+cd "$devOpsPath/build-bash"; source 19.get-app-version.bash;
 
 
 

+ 8 - 8
Publish/DevOps2/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile → Publish/DevOps3/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile

@@ -12,9 +12,9 @@ pipeline {
     environment {
         // get APPNAME
         // APPNAME = "Sers"
-        APPNAME = readFile("Publish/DevOps2/environment/env.APPNAME.txt")
+        APPNAME = readFile("Publish/DevOps3/environment/env.APPNAME.txt")
 
-        envName = readFile("Publish/DevOps2/environment/env.envName.txt")
+        envName = readFile("Publish/DevOps3/environment/env.envName.txt")
         versionSuffix = "-${envName}${env.build_number}"
 
         //basePath = "/root/docker-cache/jenkins/jenkins_home/workspace/${APPNAME}/${envName}/${env.BRANCH_NAME}/${env.build_number}"
@@ -70,10 +70,10 @@ pipeline {
             steps {
                 script {
                     echo "#2.1 change-app-version"
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; source 22.add-suffix-to-app-version.bash;    echo -n \"\$nextAppVersion\" > $codePath/Publish/DevOps2/environment/env.appVersion.txt '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps3/build-bash; source 22.add-suffix-to-app-version.bash;    echo -n \"\$nextAppVersion\" > $codePath/Publish/DevOps3/environment/env.appVersion.txt '"
 
                     echo "#2.2 get app version"
-                    env.appVersion = readFile("Publish/DevOps2/environment/env.appVersion.txt")
+                    env.appVersion = readFile("Publish/DevOps3/environment/env.appVersion.txt")
                     echo "-------- appVersion: [${env.appVersion}]"
                 }
             }
@@ -83,7 +83,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps2/build-bash; sh startup.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps3/build-bash; sh startup.bash;  '"
                 }
             }
         }
@@ -92,7 +92,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" && env.build_crossPlatform == "yes" } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps2/build-bash; sh 40.Station-publish-multiple.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps3/build-bash; sh 40.Station-publish-multiple.bash;  '"
                 }
             }
         }
@@ -101,7 +101,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME;export NUGET_PATH=$NUGET_PATH;    export NUGET_SERVER=$NUGET_SERVER;export NUGET_KEY=$NUGET_KEY;  export DOCKER_Buildx=${env.DOCKER_Buildx};export DOCKER_ImagePrefix=${env.DOCKER_ImagePrefix};export DOCKER_USERNAME=${env.DOCKER_USERNAME};export DOCKER_PASSWORD=${env.DOCKER_PASSWORD};export DOCKER_BuildxExtArgs=\"--output=type=registry,registry.insecure=true\";    cd $codePath/Publish/DevOps2/release-bash; sh startup.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME;export NUGET_PATH=$NUGET_PATH;    export NUGET_SERVER=$NUGET_SERVER;export NUGET_KEY=$NUGET_KEY;  export DOCKER_Buildx=${env.DOCKER_Buildx};export DOCKER_ImagePrefix=${env.DOCKER_ImagePrefix};export DOCKER_USERNAME=${env.DOCKER_USERNAME};export DOCKER_PASSWORD=${env.DOCKER_PASSWORD};export DOCKER_BuildxExtArgs=\"--output=type=registry,registry.insecure=true\";    cd $codePath/Publish/DevOps3/release-bash; sh startup.bash;  '"
                 }
             }
         }
@@ -110,7 +110,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" && env.WebDav_BaseUrl != "  " } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export basePath=\"$codePath\"; export APPNAME=$APPNAME; export appVersion=\"$appVersion\";   export WebDav_BaseUrl=\"$WebDav_BaseUrl\"; export WebDav_User=\"$WebDav_User\";    cd $codePath/Publish/DevOps2/release-bash; sh 78.push-releaseFiles-to-webdav.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export basePath=\"$codePath\"; export APPNAME=$APPNAME; export appVersion=\"$appVersion\";   export WebDav_BaseUrl=\"$WebDav_BaseUrl\"; export WebDav_User=\"$WebDav_User\";    cd $codePath/Publish/DevOps3/release-bash; sh 78.push-releaseFiles-to-webdav.bash;  '"
                 }
             }
         }

+ 0 - 0
Publish/DevOps2/release-bash/71.file-zip.sh → Publish/DevOps3/release-bash/71.file-zip.sh


+ 0 - 0
Publish/DevOps2/release-bash/72.nuget-push.sh → Publish/DevOps3/release-bash/72.nuget-push.sh


+ 0 - 0
Publish/DevOps2/release-bash/73.docker-image-build-push.sh → Publish/DevOps3/release-bash/73.docker-image-build-push.sh


+ 0 - 0
Publish/DevOps2/release-bash/74.docker-image-build-push_amd64.bash → Publish/DevOps3/release-bash/74.docker-image-build-push_amd64.bash


+ 0 - 0
Publish/DevOps2/release-bash/75.docker-image-build-push_cross.bash → Publish/DevOps3/release-bash/75.docker-image-build-push_cross.bash


+ 0 - 0
Publish/DevOps2/release-bash/78.push-releaseFiles-to-webdav.bash → Publish/DevOps3/release-bash/78.push-releaseFiles-to-webdav.bash


+ 7 - 7
Publish/DevOps2/release-bash/startup.bash → Publish/DevOps3/release-bash/startup.bash

@@ -20,11 +20,11 @@ export NUGET_KEY=xxxxxxxxxx
 
 #----------------------------------------------
 # cur path
-curPath=$PWD
+curPath="$PWD"
 
-cd $curPath/../../..
-export basePath=$PWD
-cd $curPath
+cd "$curPath/../../.."
+export basePath="$PWD"
+cd "$curPath"
 
 # export basePath=/root/temp/svn
 
@@ -32,7 +32,7 @@ cd $curPath
 
 #----------------------------------------------
 echo "#1 get appVersion"
-cd $basePath/Publish/DevOps2/build-bash; source 19.get-app-version.bash;
+cd "$curPath/../build-bash"; source 19.get-app-version.bash;
 
 
 
@@ -46,11 +46,11 @@ for file in *.sh
 do
     echo "-----------------------------------------------------------------"
     echo "[$(date "+%H:%M:%S")] sh $file"
-    sh $file
+    sh "$file"
 done
 
 
-
+cd "$curPath"
 
 
 

+ 0 - 32
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/docker导入导出镜像.txt

@@ -1,32 +0,0 @@
-#导出镜像
-export tag=${tag}
-
-docker save -o /root/image/dotnet.2.1.tar serset/dotnet:2.1
-docker save -o /root/image/sers-cgateway-1.2.0.tar serset/sers-cgateway:1.2.0
-
-
-docker save -o /root/image/sers.${tag}.tar serset/sers:${tag}
-docker save -o /root/image/sers-gateway.${tag}.tar serset/sers-gateway:${tag}
-docker save -o /root/image/sers-gover.${tag}.tar serset/sers-gover:${tag}
-
-docker save -o /root/image/sers-demo-robot.${tag}.tar serset/sers-demo-robot:${tag}
-docker save -o /root/image/sers-demo-sersall.${tag}.tar serset/sers-demo-sersall:${tag}
-docker save -o /root/image/sers-demo.${tag}.tar serset/sers-demo:${tag}
-
-
-
-#导入镜像
-
-docker load -i /root/image/dotnet.2.1.tar
-docker load -i /root/image/sers-cgateway.1.2.0.tar
-
-docker load -i /root/image/sers.${tag}.tar
-docker load -i /root/image/sers-gateway.${tag}.tar
-docker load -i /root/image/sers-gover.${tag}.tar
-
-docker load -i /root/image/sers-demo-robot.${tag}.tar
-docker load -i /root/image/sers-demo-sersall.${tag}.tar 
-docker load -i /root/image/sers-demo.${tag}.tar 
-
-
- 

+ 0 - 3
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/Dockerfile

@@ -1,3 +0,0 @@
-FROM ubuntu:20.04
-COPY root /root
-CMD ["sh","/root/app/startup.sh"]

BIN
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/CGateway/Gateway


+ 0 - 65
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/CGateway/appsettings.json

@@ -1,65 +0,0 @@
-{
-  "Sers": {
-
-  	"//Mq":" 消息队列配置",
-    "Mq": {
-      "Socket": {
-        "//host":" ServiceCenter 服务端 host地址",
-        "host": "127.0.0.1",
-        "//port":" ServiceCenter 服务端 监听端口号 ",
-        "port": 10345, 
-            
-
-        "//(x.1)workThread":" 后台处理消息的线程个数(单位个,默认16) ",
-        "workThreadCount": 16,
-
-        "//(x.2)ping":" ",
-        
-        "//pingTimeout":" 心跳测试超时时间(单位ms,默认2000)",        
-        "pingTimeout": 30000,
-        
-        "//pingRetryCount":" 心跳测试失败重试次数(单位次,默认3)",         
-        "pingRetryCount": 10,
-        
-        "//pingInterval":" 心跳测试时间间隔(单位ms,默认1000)",       
-        "pingInterval": 10000,
-
-       
-        "//(x.3)request":" ",  
-        "//requestTimeout":" 请求超时时间(单位ms,默认300000)",      
-        "requestTimeout": 60000,
-        
- 
-        "//(x.4)secretKey":" 连接秘钥,用以验证连接安全性。服务端和客户端必须一致 ",
-        "secretKey": "SersSocketMq"
-      }
-    },
- 
- 
-    "Gateway": {
-	"//Console_PrintLog":"  print the log to console. default:false ",
-	"Console_PrintLog":"false",
-
-	"Rpc":{ 	"CallerSource":"OutSide"},
-	"WebHost":{ 	
-		"http_port":"6008", "workThreadCount":16,
-		
-		"//ResponseDefaultContentType":" Response Default  Content-Type ",
-		"ResponseDefaultContentType": "application/json; charset=UTF-8",	
-
-		"//ResponseExtHeaders":" Response Ext Headers.(enable CORS)",
-		"ResponseExtHeaders": "\nAccess-Control-Allow-Headers: Authorization,authorization,Content-Type\nAccess-Control-Allow-Headers: *\nAccess-Control-Allow-Credentials: true\nAccess-Control-Allow-Origin: *"	
-	},
-
-	"StationRegist_RegistArg":
-	{	"serviceStationInfo":		{"serviceStationKey":"CGateway001","stationVersion":"1.2.0","serviceStationName":"CGateway"}
-		,"deviceInfo":	{"deviceKey":"CGateway001","OSPlatform":"Linux","OSArchitecture":"X64","OSDescription":"Ubuntu","MachineName":"Linux"}
-		,"apiNodes":[]	
-	}	
-
-	
-    }
-  }
-
-
-}

+ 0 - 26
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/CGateway/readme.md

@@ -1,26 +0,0 @@
-Sers CGateway v1.2.0
-
---------------------------------------------
-说明:
-
-
-
-1. 开发环境:Ubuntu eclipse c++   
-    运行环境:Linux
-
-
-
-
-2. linux运行脚本:
-
-cd /root/netapp/CGateway
-
-chmod  -R 777  ./Gateway
-
- ./Gateway
-
-
-
-
-
- 

+ 0 - 5
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-cgateway-1.2.0/root/app/startup.sh

@@ -1,5 +0,0 @@
-cd   /root/app/CGateway
-chmod  -R 777  ./Gateway
-
-#echo "run CGateway"
-./Gateway

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-robot/Dockerfile

@@ -1,2 +0,0 @@
-FROM serset/dotnet:6.0-runtime
-COPY root /root

+ 0 - 3
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-robot/root/app/startup.sh

@@ -1,3 +0,0 @@
-cd  /root/app/Robot
-
-dotnet App.Robot.Station.dll

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-sersall/Dockerfile

@@ -1,2 +0,0 @@
-FROM serset/dotnet:6.0
-COPY root /root

+ 0 - 3
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo-sersall/root/app/startup.sh

@@ -1,3 +0,0 @@
-cd   /root/app/ServiceCenter
-
-dotnet App.ServiceCenter.dll

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo/Dockerfile

@@ -1,2 +0,0 @@
-FROM serset/dotnet:6.0-runtime
-COPY root /root

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-demo/root/app/startup.sh

@@ -1,2 +0,0 @@
-cd   /root/app/Demo
-dotnet Did.SersLoader.Demo.dll

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gateway/Dockerfile

@@ -1,2 +0,0 @@
-FROM serset/dotnet:6.0
-COPY root /root

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gateway/root/app/startup.sh

@@ -1,2 +0,0 @@
-cd   /root/app/Gateway
-dotnet App.Gateway.dll

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gover/Dockerfile

@@ -1,2 +0,0 @@
-FROM serset/dotnet:6.0
-COPY root /root

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers-gover/root/app/startup.sh

@@ -1,2 +0,0 @@
-cd /root/app/Gover
-dotnet App.Gover.Gateway.dll

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers/Dockerfile

@@ -1,2 +0,0 @@
-FROM serset/dotnet:6.0
-COPY root /root

+ 0 - 2
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/sers/root/app/startup.sh

@@ -1,2 +0,0 @@
-cd   /root/app/ServiceCenter
-dotnet App.ServiceCenter.dll

+ 0 - 87
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/制作镜像Sers.txt

@@ -1,87 +0,0 @@
-#构建多架构镜像
-
-#docker login -u serset -p xxxxxxxxx
-
-#---------------------------------------------------------------------
-#(x.1)初始化构建器
-
-#启用 buildx 插件
-export DOCKER_CLI_EXPERIMENTAL=enabled
-
-#验证是否开启
-docker buildx version
-
-#启用 binfmt_misc
-docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
-
-#验证是 binfmt_misc 否开启
-ls -al /proc/sys/fs/binfmt_misc/
-
-
-#创建一个新的构建器
-docker buildx create --use --name mybuilder
-
-#启动构建器
-docker buildx inspect mybuilder --bootstrap
-
-#查看当前使用的构建器及构建器支持的 CPU 架构,可以看到支持很多 CPU 架构:
-docker buildx ls
-
-
-
-#---------------------------------------------------------------------
-#(x.2)构建多架构镜像( arm、arm64 和 amd64 )并推送到 Docker Hub
-
-#把文件夹拷贝到image下
-cd /root/image
-
-
-#构建镜像并推送到 Docker Hub 
-export tag=2.1.3.627
-
-cd sers
-docker buildx build . -t serset/sers:${tag} -t serset/sers --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
-cd .. 
-
-
-cd sers-gover 
-docker buildx build . -t serset/sers-gover:${tag} -t serset/sers-gover --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
-cd ..
-
-
-cd sers-gateway
-docker buildx build . -t serset/sers-gateway:${tag} -t serset/sers-gateway --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
-cd ..
-
-
-
-cd sers-demo-robot 
-docker buildx build . -t serset/sers-demo-robot:${tag} -t serset/sers-demo-robot --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
-cd ..
-
-cd sers-demo
-docker buildx build . -t serset/sers-demo:${tag} -t serset/sers-demo --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
-cd ..
-
-cd sers-demo-sersall 
-docker buildx build . -t serset/sers-demo-sersall:${tag} -t serset/sers-demo-sersall --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
-cd ..
-
- 
-
-
-#强制删除镜像名称中包含sers的镜像
-# docker rmi --force $(docker images | grep sers- | awk '{print $3}')
-
-
-
-
-
-
-
-
-
-
-
-
- 

+ 0 - 48
Publish/ReleaseFile/SersDocker(2021-05-19)/docker制作镜像Sers/制作镜像sers-cgateway-1.2.0.txt

@@ -1,48 +0,0 @@
-#构建多架构镜像
-
-#docker login -u serset -p xxxxxxxxx
-
-#---------------------------------------------------------------------
-#(x.1)初始化构建器
-
-#启用 buildx 插件
-export DOCKER_CLI_EXPERIMENTAL=enabled
-
-#验证是否开启
-docker buildx version
-
-#启用 binfmt_misc
-docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
-
-#验证是 binfmt_misc 否开启
-ls -al /proc/sys/fs/binfmt_misc/
-
-
-#创建一个新的构建器
-docker buildx create --use --name mybuilder
-
-#启动构建器
-docker buildx inspect mybuilder --bootstrap
-
-#查看当前使用的构建器及构建器支持的 CPU 架构,可以看到支持很多 CPU 架构:
-docker buildx ls
-
-
-
-#---------------------------------------------------------------------
-#(x.2)构建多架构镜像( arm、arm64 和 amd64 )并推送到 Docker Hub 
-
-#把本文件所在目录下的cgateway文件夹拷贝到 image 
-cd /root/image 
-
-#构建镜像并推送到 Docker Hub
-cd sers-cgateway-1.2.0
-docker buildx build . -t serset/sers-cgateway:1.2.0 -t serset/sers-cgateway --platform=linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x --push
-cd .. 
-
- 
-#强制删除镜像名称中包含sers的镜像
-# docker rmi --force $(docker images | grep sers- | awk '{print $3}')
-
-
-

+ 0 - 65
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-cgateway/appsettings.json

@@ -1,65 +0,0 @@
-{
-  "Sers": {
-
-  	"//Mq":" 消息队列配置",
-    "Mq": {
-      "Socket": {
-        "//host":" ServiceCenter 服务端 host地址",
-        "host": "127.0.0.1",
-        "//port":" ServiceCenter 服务端 监听端口号 ",
-        "port": 4580, 
-            
-
-        "//(x.1)workThread":" 后台处理消息的线程个数(单位个,默认16) ",
-        "workThreadCount": 16,
-
-        "//(x.2)ping":" ",
-        
-        "//pingTimeout":" 心跳测试超时时间(单位ms,默认2000)",        
-        "pingTimeout": 30000,
-        
-        "//pingRetryCount":" 心跳测试失败重试次数(单位次,默认3)",         
-        "pingRetryCount": 10,
-        
-        "//pingInterval":" 心跳测试时间间隔(单位ms,默认1000)",       
-        "pingInterval": 10000,
-
-       
-        "//(x.3)request":" ",  
-        "//requestTimeout":" 请求超时时间(单位ms,默认300000)",      
-        "requestTimeout": 60000,
-        
- 
-        "//(x.4)secretKey":" 连接秘钥,用以验证连接安全性。服务端和客户端必须一致 ",
-        "secretKey": "SersCL"
-      }
-    },
- 
- 
-    "Gateway": {
-	"//Console_PrintLog":"  print the log to console. default:false ",
-	"Console_PrintLog":"false",
-
-	"Rpc":{ 	"CallerSource":"OutSide"},
-	"WebHost":{ 	
-		"http_port":"6008", "workThreadCount":16,
-		
-		"//ResponseDefaultContentType":" Response Default  Content-Type ",
-		"ResponseDefaultContentType": "application/json; charset=UTF-8",	
-
-		"//ResponseExtHeaders":" Response Ext Headers.(enable CORS)",
-		"ResponseExtHeaders": "\nAccess-Control-Allow-Headers: Authorization,authorization,Content-Type\nAccess-Control-Allow-Headers: *\nAccess-Control-Allow-Credentials: true\nAccess-Control-Allow-Origin: *"	
-	},
-
-	"StationRegist_RegistArg":
-	{	"serviceStationInfo":		{"serviceStationKey":"CGateway001","stationVersion":"1.2.0","serviceStationName":"CGateway"}
-		,"deviceInfo":	{"deviceKey":"CGateway001","OSPlatform":"Linux","OSArchitecture":"X64","OSDescription":"Ubuntu","MachineName":"Linux"}
-		,"apiNodes":[]	
-	}	
-
-	
-    }
-  }
-
-
-}

+ 0 - 58
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-cgateway/docker部署cgateway.txt

@@ -1,58 +0,0 @@
-docker部署sers-cgateway
-
-
----------------------------------
-#(x.1)文件
-  (x.1)把本文件所在目录中所有文件拷贝到宿主机
-  (x.2)修改配置文件 appsettings.json
- 
-
-
-#(x.2)创建容器并运行
-(--name 容器名称,可自定义)
-(--restart=always 自动重启)
-(-v /etc/localtime:/etc/localtime)挂载宿主机localtime文件解决容器时间与主机时区不一致的问题
-(-v $PWD/data:/data 将主机中当前目录下的data挂载到容器的/data)
-(--net=host 网络直接使用宿主机网络)(-p 6022:6022 端口映射)
-
-cd /root/docker
-
-cd sers-cgateway
-docker run --name=sers-cgateway --restart=always -d \
--p 6008:6008 \
--v /etc/localtime:/etc/localtime \
--v $PWD/appsettings.json:/root/app/CGateway/appsettings.json \
--v $PWD/Logs:/root/app/CGateway/Logs \
-serset/sers-cgateway:1.2.0
-cd ..
-
-
-#端口    http://ip:6008
-
-
-#(x.3)应用已经运行
-   可在文件夹Logs 中查看日志
-
--------------------
-#常用命令
-
-#查看容器logs
-docker logs sers-cgateway
-
-#在容器内执行命令行
-docker  exec -it sers-cgateway bash
-
-#停止容器
-docker stop sers-cgateway
-
-#打开容器
-docker start sers-cgateway
-
-#重启容器
-docker restart sers-cgateway
-
-
-#删除容器
-docker rm sers-cgateway -f
-
-

+ 0 - 63
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-demo-robot/docker部署sers-demo-robot.txt

@@ -1,63 +0,0 @@
-docker部署sers-demo-robot
-
- 
-
----------------------------------
-#(x.1)文件
-  (x.1)把本文件所在目录中所有文件拷贝到宿主机
-  (x.2)修改配置文件 appsettings.json
- 
-
-#(x.2)创建容器并运行
-(--name 容器名称,可自定义)
-(--restart=always 自动重启)
-(-v /etc/localtime:/etc/localtime)挂载宿主机localtime文件解决容器时间与主机时区不一致的问题
-(-v $PWD/data:/data 将主机中当前目录下的data挂载到容器的/data)
-(--net=host 网络直接使用宿主机网络)(-p 6022:6022 端口映射)
-
-cd /root/docker
-
-cd sers-demo-robot
-docker run --name=sers-demo-robot --restart=always -d \
--v /etc/localtime:/etc/localtime \
--v $PWD/appsettings.json:/root/app/Robot/appsettings.json \
--v $PWD/Logs:/root/app/Robot/Logs \
--v $PWD/Data:/root/app/Robot/Data \
-serset/sers-demo-robot
-cd ..
-
-
-#精简
-docker run --name=sers-demo-robot --restart=always --net=host -d serset/sers-demo-robot
-
- 
-
-
-#(x.3)应用已经运行
-   可在文件夹Logs 中查看日志
-
-
-
--------------------
-#常用命令
-
-#查看容器logs
-docker logs sers-demo-robot
-
-#在容器内执行命令行
-docker  exec -it sers-demo-robot bash
-
-#停止容器
-docker stop sers-demo-robot
-
-#打开容器
-docker start sers-demo-robot
-
-#重启容器
-docker restart sers-demo-robot
-
-
-#删除容器
-docker rm sers-demo-robot -f
-
-

+ 0 - 58
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-demo-sersall/docker部署sers-demo-sersall.txt

@@ -1,58 +0,0 @@
-docker部署sers-demo-sersall
- 
----------------------------------
-#(x.1)文件
-  (x.1)把本文件所在目录中所有文件拷贝到宿主机
-  (x.2)修改配置文件 appsettings.json
- 
-
-
-#(x.2)创建容器并运行
-(--name 容器名称,可自定义)
-(--restart=always 自动重启)
-(-v /etc/localtime:/etc/localtime)挂载宿主机localtime文件解决容器时间与主机时区不一致的问题
-(-v $PWD/data:/data 将主机中当前目录下的data挂载到容器的/data)
-(--net=host 网络直接使用宿主机网络)(-p 6022:6022 端口映射)
-
-cd /root/docker
-
-cd sers-demo-sersall
-docker run --name=sers-demo-sersall --restart=always -d --net=host\
--v /etc/localtime:/etc/localtime \
--v $PWD/appsettings.json:/root/app/ServiceCenter/appsettings.json \
--v $PWD/Logs:/root/app/ServiceCenter/Logs \
--v $PWD/Data:/root/app/ServiceCenter/Data \
-serset/sers-demo-sersall
-cd ..
-
-#精简
-docker run --name=sers-demo-sersall --restart=always -d --net=host serset/sers-demo-sersall
-
-
-#(x.3)应用已经运行
-   可在文件夹Logs 中查看日志
-
-
-#---------------------------------------
-#常用命令
-
-#查看容器logs
-docker logs sers-demo-sersall 
-
-#在容器内执行命令行
-docker  exec -it sers-demo-sersall  bash
-
-#停止容器
-docker stop sers-demo-sersall 
-
-#打开容器
-docker start sers-demo-sersall 
-
-#重启容器
-docker restart sers-demo-sersall 
-
-
-#删除容器
-docker rm sers-demo-sersall -f 
-
-

+ 0 - 60
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-demo/docker部署sers-demo.txt

@@ -1,60 +0,0 @@
-docker部署sers-demo
-
-
----------------------------------
-#(x.1)文件
-  (x.1)把本文件所在目录中所有文件拷贝到宿主机
-  (x.2)修改配置文件 appsettings.json
-
-
-
-#(x.2)创建容器并运行
-(--name 容器名称,可自定义)
-(--restart=always 自动重启)
-(-v /etc/localtime:/etc/localtime)挂载宿主机localtime文件解决容器时间与主机时区不一致的问题
-(-v $PWD/data:/data 将主机中当前目录下的data挂载到容器的/data)
-(--net=host 网络直接使用宿主机网络)(-p 6022:6022 端口映射)
-
-cd /root/docker
-
-cd sers-demo
-docker run --name=sers-demo --restart=always -d \
--v /etc/localtime:/etc/localtime \
--v $PWD/appsettings.json:/root/app/Demo/appsettings.json \
--v $PWD/Logs:/root/app/Demo/Logs \
-serset/sers-demo
-cd ..
-
-#精简
-docker run --name=sers-demo --restart=always -d serset/sers-demo
-
-
- 
-#(x.3)应用已经运行
-   可在文件夹Logs 中查看日志
-
-
-
--------------------
-#常用命令
-
-#查看容器logs
-docker logs sers-demo
-
-#在容器内执行命令行
-docker  exec -it sers-demo bash
-
-#停止容器
-docker stop sers-demo
-
-#打开容器
-docker start sers-demo
-
-#重启容器
-docker restart sers-demo
-
-
-#删除容器
-docker rm sers-demo -f
-
-

+ 0 - 61
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-gateway/docker部署sers-gateway.txt

@@ -1,61 +0,0 @@
-docker部署sers-gateway
-
- 
-
----------------------------------
-#(x.1)文件
-  (x.1)把本文件所在目录中所有文件拷贝到宿主机
-  (x.2)修改配置文件 appsettings.json
- 
-
-#(x.2)创建容器并运行
-(--name 容器名称,可自定义)
-(--restart=always 自动重启)
-(-v /etc/localtime:/etc/localtime)挂载宿主机localtime文件解决容器时间与主机时区不一致的问题
-(-v $PWD/data:/data 将主机中当前目录下的data挂载到容器的/data)
-(--net=host 网络直接使用宿主机网络)(-p 6022:6022 端口映射)
-
-cd /root/docker
-
-cd sers-gateway
-docker run --name=sers-gateway --restart=always -d \
--p 4582:4582 \
--v /etc/localtime:/etc/localtime \
--v $PWD/appsettings.json:/root/app/Gateway/appsettings.json \
--v $PWD/Logs:/root/app/Gateway/Logs \
--v $PWD/Data:/root/app/Gateway/Data \
-serset/sers-gateway
- 
-
-#精简
-docker run --name=sers-gateway --restart=always -d -p 4582:4582 serset/sers-gateway
-
-
-#(x.3)应用已经运行
-   可在文件夹Logs 中查看日志
-
-通信端口 tcp://ip:4582
-
--------------------
-#常用命令
-
-#查看容器logs
-docker logs sers-gateway
-
-#在容器内执行命令行
-docker  exec -it sers-gateway bash
-
-#停止容器
-docker stop sers-gateway
-
-#打开容器
-docker start sers-gateway
-
-#重启容器
-docker restart sers-gateway
-
-
-#删除容器
-docker rm sers-gateway -f
-
-

+ 0 - 61
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers-gover/docker部署sers-gover.txt

@@ -1,61 +0,0 @@
-docker部署sers-gover
- 
-
----------------------------------
-#(x.1)文件
-  (x.1)把本文件所在目录中所有文件拷贝到宿主机
-  (x.2)修改配置文件 appsettings.json
-
-
-#(x.2)创建容器并运行
-(--name 容器名称,可自定义)
-(--restart=always 自动重启)
-(-v /etc/localtime:/etc/localtime)挂载宿主机localtime文件解决容器时间与主机时区不一致的问题
-(-v $PWD/data:/data 将主机中当前目录下的data挂载到容器的/data)
-(--net=host 网络直接使用宿主机网络)(-p 6022:6022 端口映射)
-
-cd /root/docker
-
-cd sers-gover
-docker run --name=sers-gover --restart=always -d \
--p 4581:4581 \
--v /etc/localtime:/etc/localtime \
--v $PWD/appsettings.json:/root/app/Gover/appsettings.json \
--v $PWD/Logs:/root/app/Gover/Logs \
-serset/sers-gover
-cd ..
- 
-#精简
-docker run --name=sers-gover --restart=always -d -p 4581:4581 serset/sers-gover
-
-
-#(x.3)应用已经运行
-   可在文件夹Logs 中查看日志
-
-
-通信端口 tcp://ip:4581
-
-
--------------------
-#常用命令
-
-#查看容器logs
-docker logs sers-gover
-
-#在容器内执行命令行
-docker  exec -it sers-gover bash
-
-#停止容器
-docker stop sers-gover
-
-#打开容器
-docker start sers-gover
-
-#重启容器
-docker restart sers-gover
-
-
-#删除容器
-docker rm sers-gover  -f
-
-

+ 0 - 66
Publish/ReleaseFile/SersDocker(2021-05-19)/docker部署Sers/sers/docker部署sers.txt

@@ -1,66 +0,0 @@
-docker部署sers-servicecenter
-
- 
-
----------------------------------
-#(x.1)文件
-  (x.1)把本文件所在目录中所有文件拷贝到宿主机
-  (x.2)修改配置文件 appsettings.json
- 
-
-
-#(x.2)创建容器并运行
-(--name 容器名称,可自定义)
-(--restart=always 自动重启)
-(-v /etc/localtime:/etc/localtime)挂载宿主机localtime文件解决容器时间与主机时区不一致的问题
-(-v $PWD/data:/data 将主机中当前目录下的data挂载到容器的/data)
-(--net=host 网络直接使用宿主机网络)(-p 6022:6022 端口映射)
-
-cd /root/docker
-
-cd sers
-docker run --name=sers --restart=always -d \
--p 4580:4580 -p 4501:4501 \
--v /etc/localtime:/etc/localtime \
--v $PWD/appsettings.json:/root/app/ServiceCenter/appsettings.json \
--v $PWD/Logs:/root/app/ServiceCenter/Logs \
--v $PWD/Data:/root/app/ServiceCenter/Data \
-serset/sers
-cd ..
-
-
-#精简
-docker run --name=sers --restart=always -d -p 4580:4580 -p 4501:4501 serset/sers
-
-gover     http://ip:4580
-通信端口 tcp://ip:4501
-
-
-
-#(x.3)应用已经运行
-   可在文件夹ServiceCenter/Logs 中查看日志
-
- 
-#---------------------------------------
-#常用命令
-
-#查看容器logs
-docker logs sers
-
-#在容器内执行命令行
-docker  exec -it sers bash
-
-#停止容器
-docker stop sers
-
-#打开容器
-docker start sers
-
-#重启容器
-docker restart sers
-
-
-#删除容器
-docker rm sers -f
-
-

+ 0 - 38
Publish/ReleaseFile/SersDocker(2021-05-19)/pack SersDocker.bat

@@ -1,38 +0,0 @@
-
-set netVersion=net6.0
-
-@echo "copy  SersDocker"
-xcopy  "..\PublishFile\SersDocker" "SersDocker" /e /i /r /y
-
-@echo "copy sers"
-xcopy  "SersPublish\%netVersion%\ServiceCenter\appsettings.json" "SersDocker\docker꼬憾Sers\sers" 
-xcopy  "SersPublish\%netVersion%\ServiceCenter" "SersDocker\docker齡鱗쓸獗Sers\sers\root\app\ServiceCenter" /e /i /r /y
-
-
-@echo "copy sers-demo"
-xcopy  "SersPublish\%netVersion%\Demo\appsettings.json" "SersDocker\docker꼬憾Sers\sers-demo" 
-xcopy  "SersPublish\%netVersion%\Demo" "SersDocker\docker齡鱗쓸獗Sers\sers-demo\root\app\Demo" /e /i /r /y
-
-@echo "copy sers-demo-robot"
-xcopy  "SersPublish\%netVersion%\Robot\appsettings.json" "SersDocker\docker꼬憾Sers\sers-demo-robot" 
-xcopy  "SersPublish\%netVersion%\Robot" "SersDocker\docker齡鱗쓸獗Sers\sers-demo-robot\root\app\Robot" /e /i /r /y
-
-@echo "copy sers-demo-sersall"
-xcopy  "Sers箕꿎\sers箕꿎-데竟箕꿎%netVersion%\ServiceCenter\appsettings.json" "SersDocker\docker꼬憾Sers\sers-demo-sersall" 
-xcopy  "Sers箕꿎\sers箕꿎-데竟箕꿎%netVersion%\ServiceCenter" "SersDocker\docker齡鱗쓸獗Sers\sers-demo-sersall\root\app\ServiceCenter" /e /i /r /y
-
-
-
-@echo "copy sers-gateway"
-xcopy  "SersPublish\%netVersion%\Gateway\appsettings.json" "SersDocker\docker꼬憾Sers\sers-gateway" 
-xcopy  "SersPublish\%netVersion%\Gateway" "SersDocker\docker齡鱗쓸獗Sers\sers-gateway\root\app\Gateway" /e /i /r /y
-
-@echo "copy sers-gover"
-xcopy  "SersPublish\%netVersion%\Gover\appsettings.json" "SersDocker\docker꼬憾Sers\sers-gover" 
-xcopy  "SersPublish\%netVersion%\Gover" "SersDocker\docker齡鱗쓸獗Sers\sers-gover\root\app\Gover" /e /i /r /y
-
-
-
-
-
-