Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-compose-postgres/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
11 changes: 6 additions & 5 deletions src/SqlStreamStore.Server/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand All @@ -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())
Expand All @@ -57,7 +58,7 @@ await Task.WhenAll(
return 0;
}
}
catch(Exception ex)
catch (Exception ex)
{
Log.Fatal(ex, "Host terminated unexpectedly.");
return 1;
Expand Down