Merge pull request #67 from thefringeninja/update

fixed broken container references

Author: thefringeninja

.travis.yml

@@ -8,8 +8,9 @@ env:
   - 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
+    - LIBRARY_VERSION=1.2.0-beta.3.19 CONTAINER_RUNTIME_VERSION=2.2.4 CONTAINER_RUNTIME=alpine3.9    RUNTIME=alpine-x64
+    - LIBRARY_VERSION=1.2.0-beta.3.19 CONTAINER_RUNTIME_VERSION=2.2.4 CONTAINER_RUNTIME=alpine3.8    RUNTIME=alpine-x64
+    - LIBRARY_VERSION=1.2.0-beta.3.19 CONTAINER_RUNTIME_VERSION=2.2.4 CONTAINER_RUNTIME=bionic       RUNTIME=ubuntu.18.04-x64
+    - LIBRARY_VERSION=1.2.0-beta.3.19 CONTAINER_RUNTIME_VERSION=2.2.4 CONTAINER_RUNTIME=stretch-slim RUNTIME=debian.9-x64
 git:
   depth: false

Dockerfile

@@ -1,4 +1,4 @@
-ARG CONTAINER_RUNTIME_VERSION=2.2.1
+ARG CONTAINER_RUNTIME_VERSION=2.2.4
 ARG CONTAINER_RUNTIME=alpine3.8
 
 FROM node:10.12.0-alpine AS build-javascript
@@ -20,7 +20,7 @@ RUN yarn && \
     yarn react-scripts-ts build && \
     echo ${CLIENT_VERSION} > /app/.clientversion
 
-FROM microsoft/dotnet:2.2.104-sdk-stretch AS build-dotnet
+FROM mcr.microsoft.com/dotnet/core/sdk:2.2.203-stretch AS build-dotnet
 ARG CLIENT_PACKAGE=@sqlstreamstore/browser
 ARG RUNTIME=alpine-x64
 ARG LIBRARY_VERSION=1.2.0
@@ -62,7 +62,7 @@ WORKDIR /app
 
 RUN dotnet run --project build/build.csproj -- --runtime=${RUNTIME} --library-version=${LIBRARY_VERSION}
 
-FROM microsoft/dotnet:${CONTAINER_RUNTIME_VERSION}-runtime-deps-${CONTAINER_RUNTIME} AS runtime
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:${CONTAINER_RUNTIME_VERSION}-${CONTAINER_RUNTIME} AS runtime
 
 WORKDIR /app
 

build.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-alpine3.8}
+CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-alpine3.9}
 LIBRARY_VERSION=${LIBRARY_VERSION:-1.2.0-beta.3.12}
 CLIENT_VERSION=${CLIENT_VERSION:-0.9.2}
 
@@ -13,7 +13,7 @@ REMOTE_IMAGE="sqlstreamstore/server"
 
 docker build \
     --build-arg MYGET_API_KEY=$MYGET_API_KEY \
-    --build-arg CONTAINER_RUNTIME_VERSION=${CONTAINER_RUNTIME_VERSION:-2.2.1} \
+    --build-arg CONTAINER_RUNTIME_VERSION=${CONTAINER_RUNTIME_VERSION:-2.2.4} \
     --build-arg CONTAINER_RUNTIME=${CONTAINER_RUNTIME} \
     --build-arg RUNTIME=${RUNTIME:-alpine-x64} \
     --build-arg LIBRARY_VERSION=${LIBRARY_VERSION} \