Add docker-compose.yml for win & linux

build/docker/linux/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3'
+
+services:
+  minecase.server:
+    image: "sunnycase/minecase.server:ci-latest"
+
+  minecase.gateway:
+    image: "sunnycase/minecase.gateway:ci-latest"
+    ports:
+      - "25565:25565"
+    depends_on:
+      - minecase.server

build/docker/win/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3'
+
+services:
+  minecase.server:
+    image: "sunnycase/minecase.server:ci-latest-nanoserver"
+
+  minecase.gateway:
+    image: "sunnycase/minecase.gateway:ci-latest-nanoserver"
+    ports:
+      - "25565:25565"
+    depends_on:
+      - minecase.server

src/MineCase.Gateway/Dockerfile

@@ -3,4 +3,5 @@ ARG source
 WORKDIR /app
 EXPOSE 25565
 COPY ${source:-obj/Docker/publish} .
+COPY ${source:-obj/Docker/publish}/OrleansConfiguration.docker.xml OrleansConfiguration.dev.xml
 ENTRYPOINT ["dotnet", "MineCase.Gateway.dll"]

src/MineCase.Gateway/MineCase.Gateway.csproj

@@ -10,12 +10,16 @@
 
   <ItemGroup>
     <None Remove="OrleansConfiguration.dev.xml" />
+    <None Remove="OrleansConfiguration.docker.xml" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Include="OrleansConfiguration.dev.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="OrleansConfiguration.docker.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
@@ -29,6 +33,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="2.0.0" />
     <PackageReference Include="Microsoft.Orleans.Client" Version="2.0.0-beta1" />
+    <PackageReference Include="Polly" Version="5.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/MineCase.Gateway/OrleansConfiguration.docker.xml

@@ -0,0 +1,3 @@
+<ClientConfiguration xmlns="urn:orleans">
+  <Gateway Address="minecase.server" Port="30000"/>
+</ClientConfiguration>

src/MineCase.Gateway/Program.cs

@@ -6,6 +6,9 @@
 using Microsoft.Extensions.Logging;
 using MineCase.Gateway.Network;
 using System.Reflection;
+using System.Threading.Tasks;
+using Orleans.Runtime;
+using Polly;
 
 namespace MineCase.Gateway
 {
@@ -20,15 +23,7 @@ partial class Program
         static void Main(string[] args)
         {
             Console.CancelKeyPress += (s, e) => _exitEvent.Set();
-
             Configuration = LoadConfiguration();
-            var builder = new ClientBuilder()
-                .LoadConfiguration("OrleansConfiguration.dev.xml")
-                .ConfigureServices(ConfigureServices)
-                .ConfigureLogging(ConfigureLogging);
-            SelectAssemblies();
-            ConfigureApplicationParts(builder);
-            _clusterClient = builder.Build();
             Startup();
             _exitEvent.WaitOne();
         }
@@ -41,22 +36,37 @@ private static void ConfigureApplicationParts(IClientBuilder builder)
 
         private static async void Startup()
         {
-            var serviceProvider = _clusterClient.ServiceProvider;
-            var logger = _clusterClient.ServiceProvider.GetRequiredService<ILoggerFactory>().CreateLogger<Program>();
-            try
-            {
-                logger.LogInformation("Connecting to cluster...");
-                await _clusterClient.Connect();
-                logger.LogInformation("Connected to cluster.");
-            }
-            catch (Exception e)
+            ILogger logger = null;
+
+            var retryPolicy = Policy.Handle<OrleansException>()
+                .WaitAndRetryForeverAsync(
+                    retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
+                    (ex, timeSpan) => logger?.LogError($"Cluster connection failed. Next retry: {timeSpan.TotalSeconds} secs later."));
+            await retryPolicy.ExecuteAsync(async () =>
             {
-                logger.LogError("Cluster connection failed.\n" + "Exception stack trace:" + e.StackTrace);
-                _exitEvent.Set();
-                return;
-            }
-            var connectionRouter = serviceProvider.GetRequiredService<ConnectionRouter>();
+                var builder = new ClientBuilder()
+                    .LoadConfiguration("OrleansConfiguration.dev.xml")
+                    .ConfigureServices(ConfigureServices)
+                    .ConfigureLogging(ConfigureLogging);
+                SelectAssemblies();
+                ConfigureApplicationParts(builder);
+                _clusterClient = builder.Build();
+
+                var serviceProvider = _clusterClient.ServiceProvider;
+                logger = _clusterClient.ServiceProvider.GetRequiredService<ILoggerFactory>().CreateLogger<Program>();
+
+                await Connect(logger);
+            });
+
+            var connectionRouter = _clusterClient.ServiceProvider.GetRequiredService<ConnectionRouter>();
             await connectionRouter.Startup(default(CancellationToken));
         }
+
+        private static async Task Connect(ILogger logger)
+        {
+            logger.LogInformation("Connecting to cluster...");
+            await _clusterClient.Connect();
+            logger.LogInformation("Connected to cluster.");
+        }
     }
 }

src/MineCase.Server/Dockerfile

@@ -3,4 +3,5 @@ ARG source
 WORKDIR /app
 EXPOSE 30000
 COPY ${source:-obj/Docker/publish} .
+COPY ${source:-obj/Docker/publish}/OrleansConfiguration.docker.xml OrleansConfiguration.dev.xml
 ENTRYPOINT ["dotnet", "MineCase.Server.dll"]

src/MineCase.Server/MineCase.Server.csproj

@@ -55,6 +55,7 @@
     <None Remove="banned-ips.json" />
     <None Remove="banned-players.json" />
     <None Remove="ops.json" />
+    <None Remove="OrleansConfiguration.docker.xml" />
     <None Remove="server.json" />
     <None Remove="whitelist.json" />
   </ItemGroup>
@@ -75,6 +76,9 @@
     <Content Include="ops.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="OrleansConfiguration.docker.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="server.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

src/MineCase.Server/OrleansConfiguration.docker.xml

@@ -0,0 +1,17 @@
+<OrleansConfiguration xmlns="urn:orleans">
+  <Globals>
+    <SeedNode Address="localhost" Port="11111" />
+    <Liveness LivenessType ="MembershipTableGrain" />
+    <ReminderService ReminderServiceType="ReminderTableGrain"/>
+    <StorageProviders>
+      <Provider Type="Orleans.Storage.MemoryStorage" Name="PubSubStore" />
+    </StorageProviders>
+    <StreamProviders>
+      <Provider Type="Orleans.Providers.Streams.SimpleMessageStream.SimpleMessageStreamProvider" Name="JobsProvider"/>
+    </StreamProviders>
+  </Globals>
+  <Defaults>
+    <Networking Address="localhost" Port="11111" />
+    <ProxyingGateway Address="minecase.server" Port="30000" />
+  </Defaults>
+</OrleansConfiguration>