Skip to content

Ensure coverage of all active Windows releases #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 23, 2020
Merged

Ensure coverage of all active Windows releases #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1685613
Ensure coverage of all active Windows releases
TBBle Jul 22, 2020
96ccb39
Move shortTags from getLatestTag.ps1 to meta.json
TBBle Jul 22, 2020
debff32
Update README.powershellcommunity.md location in PR template
TBBle Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
- **Adds a new image or tag**
- [ ] Not Applicable
- **OR**
- [ ] Update [README.powershellcommunity.md](https://github.com/PowerShell/PowerShell-Docker/blob/master/assets/README.powershellcommunity.md)
- [ ] Update [README.powershellcommunity.md](https://github.com/PowerShell/PowerShell-Docker/blob/master/docs/README.powershellcommunity.md)
- [ ] Update [vsts-ci.yml](https://github.com/PowerShell/PowerShell-Docker/blob/master/vsts-ci.yml)
2 changes: 1 addition & 1 deletion release/lts/nanoserver1809/dependabot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

# Dummy docker image to trigger dependabot PRs

FROM mcr.microsoft.com/windows/nanoserver:1903
FROM mcr.microsoft.com/windows/nanoserver:2004
16 changes: 13 additions & 3 deletions release/lts/nanoserver1809/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
{
"IsLinux" : false,
"IsLinux": false,
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"},
{"Tag": "1903"}
{
"Tag": "1809"
},
{
"Tag": "1903"
},
{
"Tag": "1909"
},
{
"Tag": "2004"
}
],
"tagTemplates": [
"lts-nanoserver-#shorttag#"
Expand Down
2 changes: 1 addition & 1 deletion release/lts/windowsservercore/dependabot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

# Dummy docker image to trigger dependabot PRs

FROM mcr.microsoft.com/windows/servercore:1903
FROM mcr.microsoft.com/windows/servercore:2004
2 changes: 1 addition & 1 deletion release/lts/windowsservercore/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath -Force

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

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
2 changes: 1 addition & 1 deletion release/preview/nanoserver1809/dependabot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

# Dummy docker image to trigger dependabot PRs

FROM mcr.microsoft.com/windows/nanoserver:1903
FROM mcr.microsoft.com/windows/nanoserver:2004
17 changes: 13 additions & 4 deletions release/preview/nanoserver1809/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
{
"IsLinux" : false,
"IsLinux": false,
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"},
{"Tag": "1903"},
{"Tag": "1909"}
{
"Tag": "1809"
},
{
"Tag": "1903"
},
{
"Tag": "1909"
},
{
"Tag": "2004"
}
],
"tagTemplates": [
"#psversion#-nanoserver-#tag#",
Expand Down
2 changes: 1 addition & 1 deletion release/preview/windowsservercore/dependabot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

# Dummy docker image to trigger dependabot PRs

FROM mcr.microsoft.com/windows/servercore:1903
FROM mcr.microsoft.com/windows/servercore:2004
11 changes: 6 additions & 5 deletions release/preview/windowsservercore/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@

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


param(
[Switch]
$CI
$CI,
# The versions of nanoserver we care about
[string[]]
$ShortTags
)

$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath -Force

# The versions of nanoserver we care about
$shortTags = @('1809','1903','1909')
Import-Module $modulePath

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
16 changes: 15 additions & 1 deletion release/preview/windowsservercore/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,25 @@
"IsLinux": false,
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Windows Server Core, version ${fromTag}",
"shortTags": [
{
"Tag": "1809"
},
{
"Tag": "1903"
},
{
"Tag": "1909"
},
{
"Tag": "2004"
}
],
"Base64EncodePackageUrl": true,
"tagTemplates": [
"#psversion#-windowsservercore-#tag#",
"preview-windowsservercore-#shorttag#"
] ,
],
"TestProperties": {
"size": 1
}
Expand Down
17 changes: 13 additions & 4 deletions release/servicing/nanoserver1809/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
{
"IsLinux" : false,
"IsLinux": false,
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"},
{"Tag": "1903"},
{"Tag": "1909"}
{
"Tag": "1809"
},
{
"Tag": "1903"
},
{
"Tag": "1909"
},
{
"Tag": "2004"
}
],
"tagTemplates": [
"#psversion#-nanoserver-#tag#"
Expand Down
2 changes: 1 addition & 1 deletion release/servicing/windowsservercore/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath -Force

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

Get-DockerTags -ShortTags $shortTags -Image "mcr.microsoft.com/windows/servercore" -FullTagFilter '\d{4}[-_]KB\d{7}' -Mcr
17 changes: 13 additions & 4 deletions release/stable/nanoserver1809/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
{
"IsLinux" : false,
"IsLinux": false,
"PackageFormat": "PowerShell-${PS_VERSION}-win-x64.zip",
"osVersion": "Nano Server, version ${fromTag}",
"shortTags": [
{"Tag": "1809"},
{"Tag": "1903"},
{"Tag": "1909"}
{
"Tag": "1809"
},
{
"Tag": "1903"
},
{
"Tag": "1909"
},
{
"Tag": "2004"
}
],
"tagTemplates": [
"#psversion#-nanoserver-#tag#",
Expand Down
2 changes: 1 addition & 1 deletion release/stable/windowsservercore/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
Import-Module $modulePath -Force

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

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