Add architecture folder to all versions

README.md

@@ -4,10 +4,10 @@ See [dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker) for images w
 
 # Supported Linux amd64 tags
 
-- [`1.0.8-runtime-jessie`, `1.0.8-runtime`, `1.0-runtime` (*1.0/runtime/jessie/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.0/runtime/jessie/Dockerfile)
-- [`1.0.8-runtime-deps-jessie`, `1.0.8-runtime-deps`, `1.0-runtime-deps`, `1-runtime-deps` (*1.0/runtime-deps/jessie/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.0/runtime-deps/jessie/Dockerfile)
-- [`1.1.5-runtime-jessie`, `1.1.5-runtime`, `1.1-runtime`, `1-runtime` (*1.1/runtime/jessie/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/runtime/jessie/Dockerfile)
-- [`1.1.5-sdk-jessie`, `1.1.5-sdk`, `1.1-sdk`, `1-sdk` (*1.1/sdk/jessie/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/sdk/jessie/Dockerfile)
+- [`1.0.8-runtime-jessie`, `1.0.8-runtime`, `1.0-runtime` (*1.0/runtime/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.0/runtime/jessie/amd64/Dockerfile)
+- [`1.0.8-runtime-deps-jessie`, `1.0.8-runtime-deps`, `1.0-runtime-deps`, `1-runtime-deps` (*1.0/runtime-deps/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.0/runtime-deps/jessie/amd64/Dockerfile)
+- [`1.1.5-runtime-jessie`, `1.1.5-runtime`, `1.1-runtime`, `1-runtime` (*1.1/runtime/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/runtime/jessie/amd64/Dockerfile)
+- [`1.1.5-sdk-jessie`, `1.1.5-sdk`, `1.1-sdk`, `1-sdk` (*1.1/sdk/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/sdk/jessie/amd64/Dockerfile)
 - [`2.0.3-runtime-stretch`, `2.0-runtime-stretch`, `2.0.3-runtime`, `2.0-runtime`, `2-runtime`, `runtime` (*2.0/runtime/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/stretch/amd64/Dockerfile)
 - [`2.0.3-runtime-jessie`, `2.0-runtime-jessie`, `2-runtime-jessie` (*2.0/runtime/jessie/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/jessie/amd64/Dockerfile)
 - [`2.0.3-runtime-deps-stretch`, `2.0-runtime-deps-stretch`, `2.0.3-runtime-deps`, `2.0-runtime-deps`, `2-runtime-deps`, `runtime-deps` (*2.0/runtime-deps/stretch/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime-deps/stretch/amd64/Dockerfile)
@@ -30,9 +30,9 @@ See [dotnet/dotnet-docker](https://github.com/dotnet/dotnet-docker) for images w
 
 # Supported Windows Server 2016 amd64 tags
 
-- [`1.0.8-runtime-nanoserver-sac2016`, `1.0.8-runtime`, `1.0-runtime` (*1.0/runtime/nanoserver-sac2016/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.0/runtime/nanoserver-sac2016/Dockerfile)
-- [`1.1.5-runtime-nanoserver-sac2016`, `1.1.5-runtime`, `1.1-runtime`, `1-runtime` (*1.1/runtime/nanoserver-sac2016/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/runtime/nanoserver-sac2016/Dockerfile)
-- [`1.1.5-sdk-nanoserver-sac2016`, `1.1.5-sdk`, `1.1-sdk`, `1-sdk` (*1.1/sdk/nanoserver-sac2016/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/sdk/nanoserver-sac2016/Dockerfile)
+- [`1.0.8-runtime-nanoserver-sac2016`, `1.0.8-runtime`, `1.0-runtime` (*1.0/runtime/nanoserver-sac2016/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.0/runtime/nanoserver-sac2016/amd64/Dockerfile)
+- [`1.1.5-runtime-nanoserver-sac2016`, `1.1.5-runtime`, `1.1-runtime`, `1-runtime` (*1.1/runtime/nanoserver-sac2016/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/runtime/nanoserver-sac2016/amd64/Dockerfile)
+- [`1.1.5-sdk-nanoserver-sac2016`, `1.1.5-sdk`, `1.1-sdk`, `1-sdk` (*1.1/sdk/nanoserver-sac2016/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/1.1/sdk/nanoserver-sac2016/amd64/Dockerfile)
 - [`2.0.3-runtime-nanoserver-sac2016`, `2.0-runtime-nanoserver-sac2016`, `2.0.3-runtime`, `2.0-runtime`, `2-runtime`, `runtime` (*2.0/runtime/nanoserver-sac2016/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/runtime/nanoserver-sac2016/amd64/Dockerfile)
 - [`2.0.3-sdk-nanoserver-sac2016`, `2.0-sdk-nanoserver-sac2016`, `2.0.3-sdk`, `2.0-sdk`, `2-sdk`, `sdk`, `latest` (*2.0/sdk/nanoserver-sac2016/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.0/sdk/nanoserver-sac2016/amd64/Dockerfile)
 - [`2.1.0-preview1-runtime-nanoserver-sac2016`, `2.1-runtime-nanoserver-sac2016`, `2.1.0-preview1-runtime`, `2.1-runtime` (*2.1/runtime/nanoserver-sac2016/amd64/Dockerfile*)](https://github.com/dotnet/dotnet-docker-nightly/blob/master/2.1/runtime/nanoserver-sac2016/amd64/Dockerfile)

build-and-test.ps1

@@ -23,7 +23,15 @@ $manifestRepo = $manifest.Repos[0]
 $activeOS = docker version -f "{{ .Server.Os }}"
 $builtTags = @()
 
-$buildFilter = "$VersionFilter*/*/$OSFilter*"
+$buildFilter = "*"
+if (-not [string]::IsNullOrEmpty($versionFilter))
+{
+    $buildFilter = "$versionFilter/$buildFilter"
+}
+if (-not [string]::IsNullOrEmpty($OsFilter))
+{
+    $buildFilter = "$buildFilter/$OsFilter/*"
+}
 
 $manifestRepo.Images |
     ForEach-Object {

manifest.json

@@ -25,7 +25,7 @@
           },
           "platforms": [
             {
-              "dockerfile": "1.0/runtime-deps/jessie",
+              "dockerfile": "1.0/runtime-deps/jessie/amd64",
               "os": "linux",
               "tags": {
                 "1.0.8-runtime-deps-jessie": {},
@@ -50,7 +50,7 @@
           },
           "platforms": [
             {
-              "dockerfile": "1.0/runtime/jessie",
+              "dockerfile": "1.0/runtime/jessie/amd64",
               "os": "linux",
               "tags": {
                 "1.0.8-runtime-jessie": {},
@@ -60,7 +60,7 @@
               }
             },
             {
-              "dockerfile": "1.0/runtime/nanoserver-sac2016",
+              "dockerfile": "1.0/runtime/nanoserver-sac2016/amd64",
               "os": "windows",
               "tags": {
                 "1.0.8-runtime-nanoserver-sac2016": {},
@@ -80,7 +80,7 @@
           },
           "platforms": [
             {
-              "dockerfile": "1.1/runtime/jessie",
+              "dockerfile": "1.1/runtime/jessie/amd64",
               "os": "linux",
               "tags": {
                 "1.1.5-runtime-jessie": {},
@@ -93,7 +93,7 @@
               }
             },
             {
-              "dockerfile": "1.1/runtime/nanoserver-sac2016",
+              "dockerfile": "1.1/runtime/nanoserver-sac2016/amd64",
               "os": "windows",
               "tags": {
                 "1.1.5-runtime-nanoserver-sac2016": {},
@@ -122,14 +122,14 @@
           },
           "platforms": [
             {
-              "dockerfile": "1.1/sdk/jessie",
+              "dockerfile": "1.1/sdk/jessie/amd64",
               "os": "linux",
               "tags": {
                 "1.1.5-sdk-jessie": {}
               }
             },
             {
-              "dockerfile": "1.1/sdk/nanoserver-sac2016",
+              "dockerfile": "1.1/sdk/nanoserver-sac2016/amd64",
               "os": "windows",
               "tags": {
                 "1.1.5-sdk-nanoserver-sac2016": {},