build enhancements

use travis matrix build to target multiple base containers

Author: thefringeninja

.travis.yml

@@ -7,5 +7,9 @@ env:
   - secure: pnK+4X/2WLLMqEv0A2GAXHYkjjRKT+HeIOkSWLYvQc/2H8lPjg0JmQvq7MQIZJxetGv+gxSJtX2cbG55j6mj+inlHHWm87wHPh8zljJztRpH9Fz0IR5GXADuUjCRuvoHq+PJI5MZlcFPYbcaAKVOsyYlejy5Ok5wlYD2WUMMw4NH+iFmffbAuycVynZrzeEGzfx33nocUObamrMOru8UTcHEmR041mwOwjjkzzQmNSLaSt/sQvSrnR8jte3zfrCUT5H7uczs0lkO3OzhJAwqA7vULyRH9iugkauv0HzAorKXOMLKey6E/GZElHviU8E1NnbAOyoBKcITe4EDI1HSbWNQ8C7nFP6w8Rv/O1lRXWL8SHucNXbmETgJ8zlrVWlRMBmnjnjbr0uF7cK4lIaJG3B/ZsY6pMn/93pPLTLrlsl7ZCjxuplU5pfNq/ORnZnAhlKe5W2uxvNdK1C6soFaGvcvyMlcAcjx8Jhjq3Yh8sHknAl70ga/AhvjAzWaTKe5zXTxfXcRXQp5mF9k707qTDkDIeGwXxY92QeiRmFfOuH56UI4CsLgpPgk3yyaHTYZsVuJRHRSqHcNo6ivgF/vYRzSXreEWfd89d8E750SMf90ON8GiCu0cfgBbUUFtsZ8AJdwmp9F7JB23sEB9Gj1OTLgRT247hOmP0b4tinZz5M=
   - secure: fKxyki9JzY95G17hNHSy4dgDmH+zXIk50BR6honAz7LmsA9jGv2gg+l1AIUERH3eckdJwxze4K0e5hX88Xfn4j5nN8TnEw7Wwn7c1vjR9FxvRr5cjaJC0SVsOTZj4VC1R9Sqjzrkqv3jJDtDdz9B8aZMdEzJ+BkHwUMFxmuko2p2qabKnAonaGk5VDSTtDyvDMa0aFjKDYuB6MrnrxhfCzLk1ciyGL61SNfz0/u7Hj3xC6v4U0f0BQ9n65l5dIVn+mpuCdQ7GO0HGj0ySo7ffif3qqXXTx7ZWIl3wvf5RCp0PouA8q2dRHYYyGqhhCwuRNU7dfhS/eFtUtcITclZ/DJE86NBQGJ9tpUUhL7BJ3sNJZzbajh1F28paJgi595SKpScp4VGx3iBuDSKH4eb3cRj5TJqCUoscue8/uIZGgR4PGkGF4lbad3b7xexIk1YY/2Rwun1J0N7tqS0rej3ZRZBtipMF64NrVnt9dZzgsIlssZ0W2NvG0vcLX6DUdeZaR0diz8bUl1DXrMFxAUQ/QYxilvaESmCslRElzlb+5eaqQTG5lSP5l6f3ZcKAhvcUGggu9t3vjzpEq3zFa5dorCyK+es1ASNlwZtZr8in9oYkvam9aiDkZD8cEc+9u+qxvnX9w3MsA0P047YCMQGgwRl5dpizoySC3wr52voK7I=
   - secure: HvSSWjsLR6qFi9/iHMKKoVUT4BDN7h4QjKHLvcrznwpfojrA1+nIlIwgcaIkxi5WClsoPmwW8YInPlyIyV+37+SaNK4sxB2puzwaC3iHBi6Ql38q+olsLdCE8u+DcfEcnzQo8pinNoyBLRjBgHjTAbrwIkLETNOZchss4A4UVhvPSznuNz5imlZxp4LqZ2pW/YcaLeCMQzuJHt5iRM6O4CMu7O4kMP/SPQXIXcqqYWI+o4um1JFO5juXBXtrhcTkOHfvGjqZghwma1F3v7zLHtqrbGBxaTLGNj0EIWPQhQEE5wDpvAqLEZcySl0ZjsPQUJd2Uxi9b8mWM1x6WaZTu9uqIy5t9lkCwUkEAwc/LUXZxwL0oi8HncgJvu7Q5KwVn375sJ0CER0Vn1FO8jphnMbpfkqUmbZmkwoIAUENNNYyGEp6zoNnRvaFQTjEW4bL2huPS0g3BgC2xyh8d5ZsPykIgQXlM8EEA2BZkd+ep2rKjOPT94rs5V5IPuVi9FYzFIsc2kpEkKZO/38j6pEAdCVIZp1m0+KRlLNQ9FeaI+xtil95V5ALIEXpc44o5OuUSoxt5ZirYaGSJtUtxo8E+HqpNL5WrTUeE8+aZos6Tu7jF63U2ehwg5xR6EubvrBjWvSHsQKcwDfdeHK2m15S/mVlahpwyyoCASAJtV7mRJI=
+  matrix:
+    - CONTAINER_RUNTIME=alpine3.8    RUNTIME=alpine-x64
+    - CONTAINER_RUNTIME=bionic       RUNTIME=ubuntu.18.04-x64
+    - CONTAINER_RUNTIME=stretch-slim RUNTIME=debian.9-x64
 git:
   depth: false

Dockerfile

@@ -1,9 +1,12 @@
-ARG CONTAINER_RUNTIME=2.2.1-runtime-deps-alpine3.8
+ARG CONTAINER_RUNTIME_VERSION=2.2.1
+ARG CONTAINER_RUNTIME=alpine3.8
 
 FROM node:10.12.0-alpine AS build-javascript
-ARG CLIENT_VERSION=0.9.2
-ARG NPM_REGISTRY=https://registry.npmjs.org
 ARG CLIENT_PACKAGE=@sqlstreamstore/browser
+ARG CLIENT_VERSION=0.9.1-alpha.0.6
+ARG NPM_REGISTRY=https://www.myget.org/F/sqlstreamstore/npm/
+
+ENV REACT_APP_CLIENT_VERSION=${CLIENT_VERSION}
 
 WORKDIR /app
 
@@ -14,25 +17,24 @@ RUN echo "@sqlstreamstore:registry=${NPM_REGISTRY}" > .npmrc && \
 WORKDIR /app/node_modules/${CLIENT_PACKAGE}
 
 RUN yarn && \
-    yarn react-scripts-ts build
+    yarn react-scripts-ts build && \
+    echo ${CLIENT_VERSION} > /app/.clientversion
 
-FROM microsoft/dotnet:2.2.102-sdk-stretch AS build-dotnet
+FROM microsoft/dotnet:2.2.103-sdk-stretch AS build-dotnet
 ARG CLIENT_PACKAGE=@sqlstreamstore/browser
 ARG RUNTIME=alpine-x64
 ARG LIBRARY_VERSION=1.2.0
 
 WORKDIR /app
 
-COPY .git ./
+COPY ./*.sln .git ./
 
 RUN dotnet tool install -g minver-cli --version 1.0.0-beta.2 && \
-  /root/.dotnet/tools/minver > .version
-
-COPY ./*.sln ./
+    /root/.dotnet/tools/minver > .version
 
 WORKDIR /app/src
 
-COPY ./src/*/*.csproj ./
+COPY ./src/*/*.csproj ./src/Directory.Build.props ./
 
 RUN for file in $(ls *.csproj); do mkdir -p ./${file%.*}/ && mv $file ./${file%.*}/; done
 
@@ -60,10 +62,10 @@ WORKDIR /app
 
 RUN dotnet run --project build/build.csproj -- --runtime=${RUNTIME} --library-version=${LIBRARY_VERSION}
 
-FROM microsoft/dotnet:${CONTAINER_RUNTIME} AS runtime
+FROM microsoft/dotnet:${CONTAINER_RUNTIME_VERSION}-runtime-deps-${CONTAINER_RUNTIME} AS runtime
 
 WORKDIR /app
-COPY --from=build-dotnet /app/.version ./
-COPY --from=build-dotnet /app/publish ./
+
+COPY --from=build-dotnet /app/publish /app/.version ./
 
 ENTRYPOINT ["/app/SqlStreamStore.Server"]

build.sh

@@ -2,39 +2,36 @@
 
 set -e
 
+CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-alpine-3.8}
+LIBRARY_VERSION=${LIBRARY_VERSION:-1.2.0-beta.2}
+
 LOCAL_IMAGE="sql-stream-store-server"
 LOCAL="${LOCAL_IMAGE}:latest"
 
-REMOTE_IMAGE="sqlstreamstore/hal"
+REMOTE_IMAGE="sqlstreamstore/server"
 
 docker build \
     --build-arg MYGET_API_KEY=$MYGET_API_KEY \
-    --build-arg RUNTIME_CONTAINER=${RUNTIME_CONTAINER:-2.2.1-runtime-deps-alpine3.8} \
+    --build-arg CONTAINER_RUNTIME_VERSION=${CONTAINER_RUNTIME_VERSION:-2.2.1} \
+    --build-arg CONTAINER_RUNTIME=${CONTAINER_RUNTIME} \
     --build-arg RUNTIME=${RUNTIME:-alpine-x64} \
-    --build-arg LIBRARY_VERSION=${LIBRARY_VERSION:-1.2.0-beta.*} \
+    --build-arg LIBRARY_VERSION=${LIBRARY_VERSION} \
     --tag ${LOCAL} \
     .
 
-VERSION=$(docker run --entrypoint=cat ${LOCAL} /app/.version)
 
 SEMVER_REGEX="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$"
 
-[[ $VERSION =~ $SEMVER_REGEX ]]
+[[ $LIBRARY_VERSION =~ $SEMVER_REGEX ]]
 
-MAJOR="${REMOTE_IMAGE}:${BASH_REMATCH[1]}"
-MAJOR_MINOR="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
-MAJOR_MINOR_PATCH="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}"
-MAJOR_MINOR_PATCH_PRE="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}${BASH_REMATCH[4]}"
+MAJOR_MINOR="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}-${CONTAINER_RUNTIME}"
+MAJOR_MINOR_PATCH="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}-${CONTAINER_RUNTIME}"
+MAJOR_MINOR_PATCH_PRE="${REMOTE_IMAGE}:${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}${BASH_REMATCH[4]}-${CONTAINER_RUNTIME}"
 
-if [[ -n $TRAVIS_TAG && -z ${BASH_REMATCH[4]} ]]; then
+if [[ -z ${BASH_REMATCH[4]} ]]; then
     echo "Detected a tag with no prerelease."
     docker tag $LOCAL $MAJOR_MINOR_PATCH
     docker tag $LOCAL $MAJOR_MINOR
-    if [[ ${BASH_REMATCH[1]} != "0" ]]; then
-        docker tag $LOCAL $MAJOR
-    else
-        echo "Detected unstable version."
-    fi
 else
     echo "Detected a prerelease."
     docker tag $LOCAL $MAJOR_MINOR_PATCH_PRE

src/SqlStreamStore.Server/SqlStreamStore.Server.csproj

@@ -5,7 +5,7 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>latest</LangVersion>
     <CrossGenDuringPublish>false</CrossGenDuringPublish>
-    <LibraryVersion Condition="$(LibraryVersion) == ''">1.2.0-beta.*</LibraryVersion>
+    <LibraryVersion Condition="$(LibraryVersion) == ''">1.2.0-beta.2</LibraryVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ILLink.Tasks" Version="0.1.5-preview-1841731" />

src/SqlStreamStore.Server/SqlStreamStoreFactory.cs

@@ -98,7 +98,7 @@ CREATE DATABASE [{connectionStringBuilder.InitialCatalog}]
 
             var streamStore = new MsSqlStreamStoreV3(settings);
 
-            await streamStore.CreateSchemaIfNotExists(cancellationToken);
+            await streamStore.CreateSchema(cancellationToken);
 
             return streamStore;
         }
@@ -145,7 +145,7 @@ private static async Task<IStreamStore> CreatePostgresStreamStore(
 
                 var streamStore = new PostgresStreamStore(settings);
 
-                await streamStore.CreateSchemaIfNotExists(cancellationToken);
+                await streamStore.CreateSchema(cancellationToken);
 
                 return streamStore;
             }