Publish/DevOps/release-bash/50.docker-image-create.sh

@@ -24,12 +24,24 @@ echo "(x.3)copy dir"
 
 #---------------------------------------------------------------------
 echo "(x.4)copy station"
-
-\cp -rf "$publishPath/ServiceCenter/." "$dockerPath/sers/app"
-\cp -rf "$publishPath/Gateway/." "$dockerPath/sers-gateway/app"
-\cp -rf "$publishPath/Gover/." "$dockerPath/sers-gover/app"
-\cp -rf "$publishPath/Demo/." "$dockerPath/sers-demo/app"
-\cp -rf "$publishPath/Robot/." "$dockerPath/sers-demo-robot/app"
+#查找所有需要发布的项目并copy
+cd $basePath
+for file in $(grep -a '<docker>' . -rl --include *.csproj)
+do
+	cd $basePath
+	
+	#get publishName
+	publishName=`grep '<publish>' $file -r | grep -oP '>(.*)<' | tr -d '<>'`
+	
+	#get dockerName
+	dockerName=`grep '<docker>' $file -r | grep -oP '>(.*)<' | tr -d '<>'`
+
+	echo copy $dockerName
+	\cp -rf "$publishPath/$publishName/." "$dockerPath/$dockerName/app"
+done
+
+
+#copy单体压测
 \cp -rf "$basePath/Publish/release/release/StressTest/单体压测net5.0/ServiceCenter/." "$dockerPath/sers-demo-sersall/app"
  
 

Publish/ReleaseFile/docker-image/docker导入导出镜像.txt

@@ -1,5 +1,5 @@
 #导出镜像
-tag=2.1.8
+tag=2.1.9-temp
 
 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

Publish/ReleaseFile/docker-image/制作镜像Sers.txt

@@ -37,7 +37,7 @@ cd /root/image
 
 
 #构建镜像并推送到 Docker Hub 
-export tag=2.1.8
+export tag=2.1.9-temp
 
 cd sers
 docker buildx build . -t serset/sers:${tag} -t serset/sers --platform=linux/amd64,linux/arm64,linux/arm/v7 --push

dotnet/Gateway/App.Gateway/App.Gateway.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>Gateway</publish>
+		<docker>sers-gateway</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Doc/Sers.CL.Ipc.NamedPipe-额外命名管道/Sers.CL.Ipc.NamedPipe.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9-temp</Version>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>
 

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.NamedPipe/Sers.CL.Ipc.NamedPipe.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Ipc/Sers.CL.Ipc.SharedMemory/Sers.CL.Ipc.SharedMemory.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.Iocp/Sers.CL.Socket.Iocp.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Socket/Sers.CL.Socket.ThreadWait/Sers.CL.Socket.ThreadWait.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/WebSocket/Sers.CL.WebSocket/Sers.CL.WebSocket.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Zmq/FullDuplex/Sers.CL.Zmq.FullDuplex/Sers.CL.Zmq.FullDuplex.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.CL/Zmq/ThreadWait/Sers.CL.ClrZmq.ThreadWait/Sers.CL.ClrZmq.ThreadWait.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Core/Sers.Core.Temp/Sers.Core.Temp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9-temp</Version>
   </PropertyGroup>
   
   <PropertyGroup>

dotnet/Library/Sers/Sers.Core/Sers.Core/Sers.Core.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Gateway/Sers.Gateway/Sers.Gateway.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Hardware/Sers.Hardware/Sers.Hardware.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.Serslot/Sers.Serslot/Sers.Serslot.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/Library/Sers/Sers.ServiceStation/Sers.ServiceStation/Sers.ServiceStation.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/App.Gover.Gateway/App.Gover.Gateway.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>Gover</publish>
+		<docker>sers-gover</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx.csproj

@@ -45,29 +45,29 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Ipc.NamedPipe, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Ipc.NamedPipe.2.1.8\lib\netstandard2.0\Sers.CL.Ipc.NamedPipe.dll</HintPath>
+    <Reference Include="Sers.CL.Ipc.NamedPipe, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Ipc.NamedPipe.2.1.9-temp\lib\netstandard2.0\Sers.CL.Ipc.NamedPipe.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Socket.Iocp, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Socket.Iocp.2.1.8\lib\netstandard2.0\Sers.CL.Socket.Iocp.dll</HintPath>
+    <Reference Include="Sers.CL.Socket.Iocp, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Socket.Iocp.2.1.9-temp\lib\netstandard2.0\Sers.CL.Socket.Iocp.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.Socket.ThreadWait, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.Socket.ThreadWait.2.1.8\lib\netstandard2.0\Sers.CL.Socket.ThreadWait.dll</HintPath>
+    <Reference Include="Sers.CL.Socket.ThreadWait, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.Socket.ThreadWait.2.1.9-temp\lib\netstandard2.0\Sers.CL.Socket.ThreadWait.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.CL.WebSocket, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.CL.WebSocket.2.1.8\lib\netstandard2.0\Sers.CL.WebSocket.dll</HintPath>
+    <Reference Include="Sers.CL.WebSocket, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.CL.WebSocket.2.1.9-temp\lib\netstandard2.0\Sers.CL.WebSocket.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Core, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Core.2.1.8\lib\netstandard2.0\Sers.Core.dll</HintPath>
+    <Reference Include="Sers.Core, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Core.2.1.9-temp\lib\netstandard2.0\Sers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Gover, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Gover.2.1.8\lib\netstandard2.0\Sers.Gover.dll</HintPath>
+    <Reference Include="Sers.Gover, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Gover.2.1.9-temp\lib\netstandard2.0\Sers.Gover.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.Hardware, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.Hardware.2.1.8\lib\netstandard2.0\Sers.Hardware.dll</HintPath>
+    <Reference Include="Sers.Hardware, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.Hardware.2.1.9-temp\lib\netstandard2.0\Sers.Hardware.dll</HintPath>
     </Reference>
-    <Reference Include="Sers.ServiceCenter, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sers.ServiceCenter.2.1.8\lib\netstandard2.0\Sers.ServiceCenter.dll</HintPath>
+    <Reference Include="Sers.ServiceCenter, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sers.ServiceCenter.2.1.9-temp\lib\netstandard2.0\Sers.ServiceCenter.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -80,8 +80,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Vit.Core, Version=2.1.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Vit.Core.2.1.8\lib\netstandard2.0\Vit.Core.dll</HintPath>
+    <Reference Include="Vit.Core, Version=2.1.9-temp, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Vit.Core.2.1.9-temp\lib\netstandard2.0\Vit.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

dotnet/ServiceCenter/App.ServiceCenter.NetFx/App.ServiceCenter.NetFx/packages.config

@@ -4,14 +4,14 @@
   <package id="Microsoft.DotNet.PlatformAbstractions" version="2.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyModel" version="2.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="Sers.CL.Ipc.NamedPipe" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.CL.Socket.Iocp" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.CL.Socket.ThreadWait" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.CL.WebSocket" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.Core" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.Gover" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.Hardware" version="2.1.8" targetFramework="net461" />
-  <package id="Sers.ServiceCenter" version="2.1.8" targetFramework="net461" />
+  <package id="Sers.CL.Ipc.NamedPipe" version="2.1.9-temp" targetFramework="net461" />
+  <package id="Sers.CL.Socket.Iocp" version="2.1.9-temp" targetFramework="net461" />
+  <package id="Sers.CL.Socket.ThreadWait" version="2.1.9-temp" targetFramework="net461" />
+  <package id="Sers.CL.WebSocket" version="2.1.9-temp" targetFramework="net461" />
+  <package id="Sers.Core" version="2.1.9-temp" targetFramework="net461" />
+  <package id="Sers.Gover" version="2.1.9-temp" targetFramework="net461" />
+  <package id="Sers.Hardware" version="2.1.9-temp" targetFramework="net461" />
+  <package id="Sers.ServiceCenter" version="2.1.9-temp" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
-  <package id="Vit.Core" version="2.1.8" targetFramework="net461" />
+  <package id="Vit.Core" version="2.1.9-temp" targetFramework="net461" />
 </packages>

dotnet/ServiceCenter/App.ServiceCenter/App.ServiceCenter.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>ServiceCenter</publish>
+		<docker>sers</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 		<PackageProjectUrl>https://github.com/serset/Sers</PackageProjectUrl>
 	</PropertyGroup>
 

dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Txt/Sers.Gover.Apm.Txt.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/Sers.ServiceCenter/Apm/Sers.Gover.Apm.Zipkin/Sers.Gover.Apm.Zipkin.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.Gover/Sers.Gover.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter/Sers.ServiceCenter.csproj

@@ -6,7 +6,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.Demo/Did.SersLoader.Demo.csproj

@@ -2,12 +2,13 @@
 
 	<PropertyGroup>
 		<publish>Demo</publish>
+		<docker>sers-demo</docker>
 	</PropertyGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9-temp</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>

dotnet/ServiceStation/Demo/SersLoader/Did.SersLoader.HelloWorld/Did.SersLoader.HelloWorld.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.8</Version>
+    <Version>2.1.9-temp</Version>
     <Description>https://github.com/serset/Sers</Description>
   </PropertyGroup>
 

dotnet/ServiceStation/Demo/StressTest/App.Robot.Station/App.Robot.Station.csproj

@@ -2,13 +2,14 @@
 
 	<PropertyGroup>
 		<publish>Robot</publish>
+		<docker>sers-demo-robot</docker>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>
-		<Version>2.1.8</Version>
+		<Version>2.1.9-temp</Version>
 		<Description>https://github.com/serset/Sers</Description>
 	</PropertyGroup>