Merge pull request #58 from thefringeninja/json

Update Dependencies

Author: thefringeninja

Dockerfile

@@ -3,7 +3,7 @@ ARG CONTAINER_RUNTIME=alpine3.8
 
 FROM node:10.12.0-alpine AS build-javascript
 ARG CLIENT_PACKAGE=@sqlstreamstore/browser
-ARG CLIENT_VERSION=0.9.1
+ARG CLIENT_VERSION=0.9.2
 ARG NPM_REGISTRY=https://www.myget.org/F/sqlstreamstore/npm/
 
 ENV REACT_APP_CLIENT_VERSION=${CLIENT_VERSION}

build.sh

@@ -3,8 +3,8 @@
 set -e
 
 CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-alpine3.8}
-LIBRARY_VERSION=${LIBRARY_VERSION:-1.2.0-beta.3.6}
-CLIENT_VERSION=${CLIENT_VERSION:-0.9.1}
+LIBRARY_VERSION=${LIBRARY_VERSION:-1.2.0-beta.3.12}
+CLIENT_VERSION=${CLIENT_VERSION:-0.9.2}
 
 LOCAL_IMAGE="sql-stream-store-server"
 LOCAL="${LOCAL_IMAGE}:latest"

examples/docker-compose-postgres/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.1'
 services:
   sql-stream-store:
     container_name: sss-example-server
-    image: sqlstreamstore/server:1.2.0-beta.2-alpine3.8
+    image: sqlstreamstore/server:1.2.0-beta.3.12-alpine3.8
     ports:
       - "5000:80"
     networks:

src/SqlStreamStore.Server/Browser/SqlStreamStoreBrowserMiddleware.cs

@@ -22,7 +22,7 @@ public static IApplicationBuilder UseSqlStreamStoreBrowser(
                 .Where(name => name.StartsWith(typeof(SqlStreamStoreBrowserMiddleware).Namespace));
 
             Log.Debug(
-                $"The following embedded resources were found and will be served as  static content: {string.Join(", ", staticFiles)}");
+                $"The following embedded resources were found and will be served as static content: {string.Join(", ", staticFiles)}");
 
             return builder.Use(IndexPage).UseStaticFiles(new StaticFileOptions
             {

src/SqlStreamStore.Server/Program.cs

@@ -15,7 +15,7 @@ internal class Program : IDisposable
 
         public static async Task<int> Main(string[] args)
         {
-            using(var program = new Program(args))
+            using (var program = new Program(args))
             {
                 return await program.Run();
             }
@@ -39,13 +39,14 @@ private async Task<int> Run()
         {
             try
             {
-                using(var streamStore = await _factory.Create(_cts.Token))
-                using(var host = new WebHostBuilder()
+                using (var streamStore = await _factory.Create(_cts.Token))
+                using (var host = new WebHostBuilder()
                     .UseKestrel()
                     .UseStartup(new SqlStreamStoreServerStartup(streamStore,
                         new SqlStreamStoreMiddlewareOptions
                         {
-                            UseCanonicalUrls = _configuration.UseCanonicalUris
+                            UseCanonicalUrls = _configuration.UseCanonicalUris,
+                            ServerAssembly = typeof(Program).Assembly
                         }))
                     .UseSerilog()
                     .Build())
@@ -57,7 +58,7 @@ await Task.WhenAll(
                     return 0;
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Log.Fatal(ex, "Host terminated unexpectedly.");
                 return 1;