Update 2.0 images to aspnetcore 2.0.3 (#328)

Author: natemcmaster

.appveyor.yml

@@ -5,8 +5,8 @@ test_script:
 environment:
  matrix:
  - folder_filter: 2.0/nanoserver-sac2016/*
- - folder_filter: 1.1*
- - folder_filter: 1.0*
+ - folder_filter: 1.1/*
+ - folder_filter: 1.0/*
 matrix:
  fast_finish: true
 branches:

.travis.yml

@@ -9,16 +9,12 @@ services:
  - docker
 env:
  matrix:
- - folder_filter=2.0*
- - folder_filter=1.1*
- - folder_filter=1.0*
+ - folder_filter=2.0/*
+ - folder_filter=1.1/*
+ - folder_filter=1.0/*
 matrix:
  fast_finish: true
 before_install:
  - bash <(curl -fsSL https://raw.githubusercontent.com/PowerShell/PowerShell/v6.0.0-beta.6/tools/download.sh)
-install:
- - ./build.ps1 -Folder $folder_filter
-before_script:
- - docker build --rm -t testrunner -f ./test/Dockerfile.testrunner.linux .
 script:
- - /bin/bash -c "docker run --add-host dockerhost:$(ifconfig eth0 | grep -oP 'inet addr:\K\S+') -v /var/run/docker.sock:/var/run/docker.sock testrunner powershell -File ./test/test.ps1 -Folder $folder_filter -HostIP dockerhost"
+ - ./ci-build.sh

2.0/jessie/kitchensink/Dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.0.0-sdk-2.0.2-jessie
+FROM microsoft/dotnet:2.0.3-sdk-jessie
 
 # set up environment
 ENV ASPNETCORE_URLS http://+:80
 ENV NODE_VERSION 6.11.3
-ENV ASPNETCORE_PKG_VERSION 2.0.0
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 RUN set -ex \
  && for key in \

2.0/jessie/runtime/Dockerfile

@@ -1,12 +1,13 @@
-FROM microsoft/dotnet:2.0.0-runtime-jessie
+FROM microsoft/dotnet:2.0.3-runtime-jessie
 
 # set up network
 ENV ASPNETCORE_URLS http://+:80
-ENV ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL https://dist.asp.net/runtimestore/2.0.0/linux-x64/aspnetcore.runtimestore.tar.gz
-ENV ASPNETCORE_PKG_VERSION 2.0.0
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 # set up the runtime store
-RUN curl -o /tmp/runtimestore.tar.gz $ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL \
- && export DOTNET_HOME=$(dirname $(readlink $(which dotnet))) \
- && tar -x -C $DOTNET_HOME -f /tmp/runtimestore.tar.gz \
- && rm /tmp/runtimestore.tar.gz
+RUN for version in '2.0.0' '2.0.3'; do \
+ curl -o /tmp/runtimestore.tar.gz https://dist.asp.net/runtimestore/$version/linux-x64/aspnetcore.runtimestore.tar.gz \
+ && export DOTNET_HOME=$(dirname $(readlink $(which dotnet))) \
+ && tar -x -C $DOTNET_HOME -f /tmp/runtimestore.tar.gz \
+ && rm /tmp/runtimestore.tar.gz; \
+ done

2.0/jessie/sdk/Dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.0.0-sdk-2.0.2-jessie
+FROM microsoft/dotnet:2.0.3-sdk-jessie
 
 # set up environment
 ENV ASPNETCORE_URLS http://+:80
 ENV NODE_VERSION 6.11.3
-ENV ASPNETCORE_PKG_VERSION 2.0.0
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 # Install keys required for node
 RUN set -ex \

2.0/nanoserver-1709/kitchensink/Dockerfile

@@ -34,13 +34,13 @@ RUN Invoke-WebRequest -UseBasicParsing https://distaspnet.blob.core.windows.net/
 
 
 # Kitchen Sink image
-FROM microsoft/dotnet:2.0.0-sdk-2.0.2-nanoserver-1709
+FROM microsoft/dotnet:2.0.3-sdk-nanoserver-1709
 
 # Note: Kitchen Sink image's SHELL is the CMD shell (different than the installer image).
 
 # Set up environment
 ENV ASPNETCORE_URLS http://+:80
-ENV ASPNETCORE_PKG_VERSION 2.0.0
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 # Install node, bower, and git
 COPY --from=installer-env ["nodejs", "C:\\Program Files\\nodejs"]

2.0/nanoserver-1709/runtime/Dockerfile

@@ -6,22 +6,22 @@ FROM microsoft/windowsservercore:1709 AS installer-env
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 # Retrieve the runtime store
-ENV ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL https://dist.asp.net/runtimestore/2.0.0/win-x64/aspnetcore.runtimestore.zip
-
-RUN Write-Host \"Downloading and extracting ${env:ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL}\"; `
- Invoke-WebRequest $env:ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL -OutFile cache.zip; `
- Expand-Archive cache.zip -DestinationPath RuntimeStore; `
- Remove-Item -Force cache.zip
-
+RUN @('2.0.0', '2.0.3') | % { `
+ $downloadUrl = \"https://dist.asp.net/runtimestore/${_}/win-x64/aspnetcore.runtimestore.zip\"; `
+ Write-Host \"Downloading and extracting $downloadUrl\"; `
+  Invoke-WebRequest $downloadUrl -OutFile cache.zip; `
+  Expand-Archive cache.zip -DestinationPath RuntimeStore; `
+  Remove-Item -Force cache.zip; `
+ }
 
 # Runtime image
-FROM microsoft/dotnet:2.0.0-runtime-nanoserver-1709
+FROM microsoft/dotnet:2.0.3-runtime-nanoserver-1709
 
 # Note: Runtime image's SHELL is the CMD shell (different than the installer image).
 
 # Set up network
 ENV ASPNETCORE_URLS http://+:80
-ENV ASPNETCORE_PKG_VERSION 2.0.0
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 # Set up the runtime store
 COPY --from=installer-env ["RuntimeStore", "C:\\Program Files\\dotnet"]

2.0/nanoserver-1709/sdk/Dockerfile

@@ -19,13 +19,13 @@ RUN Invoke-WebRequest -UseBasicParsing https://nodejs.org/dist/v${env:NODE_VERSI
 
 
 # Build image
-FROM microsoft/dotnet:2.0.0-sdk-2.0.2-nanoserver-1709
+FROM microsoft/dotnet:2.0.3-sdk-nanoserver-1709
 
 # Note: Build image's SHELL is the CMD shell (different than the installer image).
 
 # Set up environment
 ENV ASPNETCORE_URLS http://+:80
-ENV ASPNETCORE_PKG_VERSION 2.0.0
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 # Install node, bower, and git
 COPY --from=installer-env ["nodejs", "C:\\Program Files\\nodejs"]

2.0/nanoserver-sac2016/kitchensink/Dockerfile

@@ -1,10 +1,10 @@
 # escape=`
-FROM microsoft/dotnet:2.0.0-sdk-2.0.2-nanoserver-10.0.14393.1770
+FROM microsoft/dotnet:2.0.3-sdk-nanoserver-sac2016
 
 # set up environment
 ENV ASPNETCORE_URLS http://+:80
 ENV NODE_VERSION 6.11.3
-ENV ASPNETCORE_PKG_VERSION 2.0.0
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 # Install node, bower, and git
 RUN Invoke-WebRequest -UseBasicParsing https://nodejs.org/dist/v${env:NODE_VERSION}/node-v${env:NODE_VERSION}-win-x64.zip -outfile node.zip; `

2.0/nanoserver-sac2016/runtime/Dockerfile

@@ -1,14 +1,16 @@
 # escape=`
-FROM microsoft/dotnet:2.0.0-runtime-nanoserver-10.0.14393.1770
+FROM microsoft/dotnet:2.0.3-runtime-nanoserver-sac2016
 
 # set up network
 ENV ASPNETCORE_URLS http://+:80
-ENV ASPNETCORE_PKG_VERSION 2.0.0
-ENV ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL https://dist.asp.net/runtimestore/2.0.0/win-x64/aspnetcore.runtimestore.zip
+ENV ASPNETCORE_PKG_VERSION 2.0.3
 
 # set up the runtime store
-RUN Write-Host \"Downloading and extracting ${env:ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL}\"; `
- Invoke-WebRequest $env:ASPNETCORE_RUNTIMESTORE_DOWNLOAD_URL -OutFile cache.zip; `
- $env:DOTNET_HOME = $(Split-Path -Parent (Get-Command dotnet.exe).Source); `
- Expand-Archive cache.zip -DestinationPath $env:DOTNET_HOME; `
- Remove-Item -Force cache.zip
+RUN $env:DOTNET_HOME = $(Split-Path -Parent (Get-Command dotnet.exe).Source); `
+ @('2.0.0', '2.0.3') | % { `
+ $downloadUrl = \"https://dist.asp.net/runtimestore/${_}/win-x64/aspnetcore.runtimestore.zip\"; `
+ Write-Host \"Downloading and extracting $downloadUrl\"; `
+ Invoke-WebRequest $downloadUrl -OutFile cache.zip; `
+ Expand-Archive cache.zip -DestinationPath $env:DOTNET_HOME; `
+ Remove-Item -Force cache.zip; `
+ }