Skip to content

Commit d78d60f

Browse files
TBBleTBBle
authored
Ensure coverage of all active Windows releases (#461)
1 parent 4e9c09d commit d78d60f

File tree

14 files changed

+81
-29
lines changed

14 files changed

+81
-29
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
- **Adds a new image or tag**
1515
- [ ] Not Applicable
1616
- **OR**
17-
- [ ] Update [README.powershellcommunity.md](https://github.com/PowerShell/PowerShell-Docker/blob/master/assets/README.powershellcommunity.md)
17+
- [ ] Update [README.powershellcommunity.md](https://github.com/PowerShell/PowerShell-Docker/blob/master/docs/README.powershellcommunity.md)
1818
- [ ] Update [vsts-ci.yml](https://github.com/PowerShell/PowerShell-Docker/blob/master/vsts-ci.yml)

‎release/lts/nanoserver1809/dependabot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
# Dummy docker image to trigger dependabot PRs
55

6-
FROM mcr.microsoft.com/windows/nanoserver:1903
6+
FROM mcr.microsoft.com/windows/nanoserver:2004

‎release/lts/nanoserver1809/meta.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
{
2-
"IsLinux" : false,
2+
"IsLinux": false,
33
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
44
"osVersion": "Nano Server, version ${fromTag}",
55
"shortTags": [
6-
{"Tag": "1809"},
7-
{"Tag": "1903"}
6+
{
7+
"Tag": "1809"
8+
},
9+
{
10+
"Tag": "1903"
11+
},
12+
{
13+
"Tag": "1909"
14+
},
15+
{
16+
"Tag": "2004"
17+
}
818
],
919
"tagTemplates": [
1020
"lts-nanoserver-#shorttag#"

‎release/lts/windowsservercore/dependabot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
# Dummy docker image to trigger dependabot PRs
55

6-
FROM mcr.microsoft.com/windows/servercore:1903
6+
FROM mcr.microsoft.com/windows/servercore:2004

‎release/lts/windowsservercore/getLatestTag.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
1414
Import-Module $modulePath -Force
1515

1616
# The versions of nanoserver we care about
17-
$shortTags = @('1809','1903')
17+
$shortTags = @('1809', '1903', '1909', '2004')
1818

1919
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr

‎release/preview/nanoserver1809/dependabot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
# Dummy docker image to trigger dependabot PRs
55

6-
FROM mcr.microsoft.com/windows/nanoserver:1903
6+
FROM mcr.microsoft.com/windows/nanoserver:2004

‎release/preview/nanoserver1809/meta.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
2-
"IsLinux" : false,
2+
"IsLinux": false,
33
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
44
"osVersion": "Nano Server, version ${fromTag}",
55
"shortTags": [
6-
{"Tag": "1809"},
7-
{"Tag": "1903"},
8-
{"Tag": "1909"}
6+
{
7+
"Tag": "1809"
8+
},
9+
{
10+
"Tag": "1903"
11+
},
12+
{
13+
"Tag": "1909"
14+
},
15+
{
16+
"Tag": "2004"
17+
}
918
],
1019
"tagTemplates": [
1120
"#psversion#-nanoserver-#tag#",

‎release/preview/windowsservercore/dependabot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
# Dummy docker image to trigger dependabot PRs
55

6-
FROM mcr.microsoft.com/windows/servercore:1903
6+
FROM mcr.microsoft.com/windows/servercore:2004

‎release/preview/windowsservercore/getLatestTag.ps1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33

44
# return objects representing the tags we need to base the nanoserver image on
55

6+
67
param(
78
[Switch]
8-
$CI
9+
$CI,
10+
# The versions of nanoserver we care about
11+
[string[]]
12+
$ShortTags
913
)
1014

1115
$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
1216
$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
1317
$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
14-
Import-Module $modulePath -Force
15-
16-
# The versions of nanoserver we care about
17-
$shortTags = @('1809','1903','1909')
18+
Import-Module $modulePath
1819

1920
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr

‎release/preview/windowsservercore/meta.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,25 @@
22
"IsLinux": false,
33
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
44
"osVersion": "Windows Server Core, version ${fromTag}",
5+
"shortTags": [
6+
{
7+
"Tag": "1809"
8+
},
9+
{
10+
"Tag": "1903"
11+
},
12+
{
13+
"Tag": "1909"
14+
},
15+
{
16+
"Tag": "2004"
17+
}
18+
],
519
"Base64EncodePackageUrl": true,
620
"tagTemplates": [
721
"#psversion#-windowsservercore-#tag#",
822
"preview-windowsservercore-#shorttag#"
9-
] ,
23+
],
1024
"TestProperties": {
1125
"size": 1
1226
}

‎release/servicing/nanoserver1809/meta.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
2-
"IsLinux" : false,
2+
"IsLinux": false,
33
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
44
"osVersion": "Nano Server, version ${fromTag}",
55
"shortTags": [
6-
{"Tag": "1809"},
7-
{"Tag": "1903"},
8-
{"Tag": "1909"}
6+
{
7+
"Tag": "1809"
8+
},
9+
{
10+
"Tag": "1903"
11+
},
12+
{
13+
"Tag": "1909"
14+
},
15+
{
16+
"Tag": "2004"
17+
}
918
],
1019
"tagTemplates": [
1120
"#psversion#-nanoserver-#tag#"

‎release/servicing/windowsservercore/getLatestTag.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
1414
Import-Module $modulePath -Force
1515

1616
# The versions of nanoserver we care about
17-
$shortTags = @('1809','1903','1909')
17+
$shortTags = @('1809', '1903', '1909', '2004')
1818

1919
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr

‎release/stable/nanoserver1809/meta.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
2-
"IsLinux" : false,
2+
"IsLinux": false,
33
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
44
"osVersion": "Nano Server, version ${fromTag}",
55
"shortTags": [
6-
{"Tag": "1809"},
7-
{"Tag": "1903"},
8-
{"Tag": "1909"}
6+
{
7+
"Tag": "1809"
8+
},
9+
{
10+
"Tag": "1903"
11+
},
12+
{
13+
"Tag": "1909"
14+
},
15+
{
16+
"Tag": "2004"
17+
}
918
],
1019
"tagTemplates": [
1120
"#psversion#-nanoserver-#tag#",

‎release/stable/windowsservercore/getLatestTag.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
1414
Import-Module $modulePath -Force
1515

1616
# The versions of nanoserver we care about
17-
$shortTags = @('1809','1903','1909')
17+
$shortTags = @('1809', '1903', '1909', '2004')
1818

1919
Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr

0 commit comments

Comments
 (0)