Add Ubuntu 20.04 (#422)

Author: TravisEz13

.dependabot/config.yml

@@ -32,7 +32,7 @@ update_configs:
     update_schedule: "weekly"
 
   - package_manager: "docker"
-    directory: "/release/preview/ubuntu18.04/dependabot"
+    directory: "/release/preview/ubuntu20.04/docker"
     update_schedule: "weekly"
 
   - package_manager: "docker"

.vsts-ci/releasePhase.yml

@@ -26,6 +26,25 @@ jobs:
   displayName: ${{ parameters.jobName }}
 
   steps:
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download Build Artifacts'
+    inputs:
+      downloadType: specific
+      itemPattern: buildMeta/**/*.json
+  - powershell: |
+      $json = Get-ChildItem $(System.ArtifactsDirectory)/buildmeta.json -recurse -File
+      if($json.Count -ge 1)
+      {
+        $jsonText = Get-Content -Path $json.FullName
+        $fullTag = ($jsonText | ConvertFrom-Json).FullTag
+        Write-Verbose "setting FULL_TAG to $fullTag" -verbose
+        Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
+      }
+      else{
+        Write-Verbose "Did not find buildmeta json" -verbose
+      }
+    displayName: Set FULL_TAG variable
+
   - pwsh: |
       Write-Host "##vso[task.setvariable variable=ACR_NAME;]$env:ACR_NAME_VAR"
     displayName: 'Enable ACR'

.vsts-ci/releaseStage.yml

@@ -7,7 +7,7 @@ parameters:
 
 stages:
   - stage: GenerateYaml_${{ parameters.channel }}
-    dependsOn: []
+    dependsOn: ['GenerateFullTag']
     displayName: Build ${{ parameters.channel }}
     jobs:
     - job: GenerateYaml_${{ parameters.channel }}

.vsts-ci/releasebuild.yml

@@ -8,6 +8,25 @@ variables:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
 stages:
+  - stage: GenerateFullTag
+    displayName: Generate Full Tag
+    jobs:
+    - job: GenerateFullTag
+
+      displayName: Generate Full Tag
+
+      condition: succeededOrFailed()
+      pool:
+        vmImage: ubuntu-latest
+        timeoutInMinutes: 30
+
+      steps:
+      - pwsh: |
+          $path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/BuildMeta.json'
+          @{
+            FullTag = (Get-Date).ToString("yyyyMMdd")
+          } | ConvertTo-Json | Out-File -Encoding utf8NoBOM -FilePath ./BuildMeta.json
+          Write-Host "##vso[artifact.upload containerfolder=buildMeta;artifactname=buildMeta]$path"
   - template: releaseStage.yml
     parameters:
       channel: stable
@@ -54,7 +73,7 @@ stages:
       - template: manifestSteps.yml
 
   - stage: GenerateTagsYaml
-    dependsOn: []
+    dependsOn: ['GenerateFullTag']
     jobs:
     - job: GenerateTagsYaml
 
@@ -66,6 +85,25 @@ stages:
         timeoutInMinutes: 30
 
       steps:
+      - task: DownloadBuildArtifacts@0
+        displayName: 'Download Build Artifacts'
+        inputs:
+          downloadType: specific
+          itemPattern: buildMeta/**/*.json
+      - powershell: |
+          $json = Get-ChildItem $(System.ArtifactsDirectory)/buildmeta.json -recurse -File
+          if($json.Count -ge 1)
+          {
+            $jsonText = Get-Content -Path $json.FullName
+            $fullTag = ($jsonText | ConvertFrom-Json).FullTag
+            Write-Verbose "setting FULL_TAG to $fullTag" -verbose
+            Write-Host "##vso[task.setvariable variable=FULL_TAG;]$fullTag"
+          }
+          else{
+            Write-Verbose "Did not find buildmeta json" -verbose
+          }
+        displayName: Set FULL_TAG variable
+
       - powershell: |
           $stableVersion = '$(stableReleaseTag)' -replace '^v', ''
           Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"

release/lts/debian11/test-deps/meta.json

@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 332
     }
 }

release/preview/debian11/test-deps/meta.json

@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 332
     }
 }

release/preview/ubuntu18.04/dependabot/Dockerfile

@@ -0,0 +1,107 @@
+# Docker image file that describes an Ubuntu20.04 image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:20.04 AS installer-env
+
+# Define Args for the needed to add the package
+ARG PS_VERSION=6.2.4
+ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
+ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
+ARG PS_INSTALL_VERSION=7-preview
+
+# Download the Linux tar.gz and save it
+ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+
+RUN echo ${PS_PACKAGE_URL}
+
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
+
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers from the final image
+FROM ubuntu:20.04 AS powershell
+
+ARG PS_VERSION=6.2.0-preview.3
+ARG PS_INSTALL_VERSION=7-preview
+
+# Copy only the files we need from the previous stage
+COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
+
+# Define Args and Env needed to create links
+ARG PS_INSTALL_VERSION=7-preview
+ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
+    \
+    # Define ENVs for Localization/Globalization
+    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    # set a fixed location for the Module analysis cache
+    PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Debian-11
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    # less is required for help in powershell
+        less \
+    # requied to setup the locale
+        locales \
+    # required for SSL
+        ca-certificates \
+        gss-ntlmssp \
+        libicu66 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+    # Download the Linux package and save it
+    && apt-get dist-upgrade -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && locale-gen $LANG && update-locale
+
+# Give all user execute permissions and remove write permissions for others
+RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # intialize powershell module cache
+    && pwsh \
+        -NoLogo \
+        -NoProfile \
+        -Command " \
+          \$ErrorActionPreference = 'Stop' ; \
+          \$ProgressPreference = 'SilentlyContinue' ; \
+          while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) {  \
+            Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \
+            Start-Sleep -Seconds 6 ; \
+          }"
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell:ubuntu18.04
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh-preview" ]

release/preview/ubuntu20.04/docker/Dockerfile

@@ -0,0 +1,18 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "osVersion": "Ubuntu 20.04",
+    "SkipGssNtlmSspTests": false,
+    "shortTags": [
+        {"Tag": "20.04"}
+    ],
+    "tagTemplates": [
+        "#psversion#-ubuntu-#tag#",
+        "preview-ubuntu-#shorttag#"
+    ],
+    "TestProperties": {
+        "size": 355
+    },
+    "SubImage": "test-deps"
+}

release/preview/ubuntu20.04/meta.json

@@ -0,0 +1,42 @@
+# Docker image file that describes an Ubuntu image with PowerShell and test dependencies
+ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-20.04
+
+FROM ${BaseImage}
+
+# Install dependencies and clean up
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        sudo \
+        curl \
+        wget \
+        iputils-ping \
+        iputils-tracepath \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-20.04
+
+# Define args needed only for the labels
+ARG VCS_REF="none"
+ARG IMAGE_NAME=mcr.microsoft.com/powershell/test-deps:ubuntu-20.04
+ARG PS_VERSION=6.2.3
+
+LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
+      readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      description="This Dockerfile will install the latest release of PowerShell and tools needed for runing CI/CD container jobs." \
+      org.label-schema.usage="https://github.com/PowerShell/PowerShell/tree/master/docker#run-the-docker-image-you-built" \
+      org.label-schema.url="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
+      org.label-schema.vcs-url="https://github.com/PowerShell/PowerShell-Docker" \
+      org.label-schema.name="powershell" \
+      org.label-schema.vendor="PowerShell" \
+      org.label-schema.version=${PS_VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run ${IMAGE_NAME} pwsh -c '$psversiontable'" \
+      org.label-schema.docker.cmd.devel="docker run ${IMAGE_NAME}" \
+      org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \
+      org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help"
+
+# Use PowerShell as the default shell
+# Use array to avoid Docker prepending /bin/sh -c
+CMD [ "pwsh" ]

release/preview/ubuntu20.04/test-deps/docker/Dockerfile

@@ -0,0 +1,16 @@
+{
+    "IsLinux" : true,
+    "UseLinuxVersion": false,
+    "osVersion": "Ubuntu 20.04",
+    "tagTemplates": [
+        "preview-ubuntu-#shorttag#"
+    ],
+    "SubRepository": "test-deps",
+    "OptionalTests": [
+        "test-deps",
+        "test-deps-debian"
+    ],
+    "TestProperties": {
+        "size": 358
+    }
+}

release/preview/ubuntu20.04/test-deps/meta.json

@@ -11,6 +11,6 @@
         "test-deps-debian"
     ],
     "TestProperties": {
-        "size": 316
+        "size": 332
     }
 }

release/stable/debian11/test-deps/meta.json

@@ -1,9 +1,14 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
 # Gets the current version of PowerShell from the PowerShell repo
 # or formats the version based on the parameters
 
+$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
+$repoRoot = Join-Path -path $parent -ChildPath '..'
+$modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
+Import-Module $modulePath -Force
+
 function Get-PowerShellVersion
 {
     [CmdletBinding(DefaultParameterSetName='Default')]
@@ -428,10 +433,11 @@ function Get-DockerImageMetaDataWrapper
     $scriptPath = Join-Path -Path $imagePath -ChildPath 'getLatestTag.ps1'
     $metaJsonPath = Join-Path -Path $imagePath -ChildPath 'meta.json'
 
-    # skip an image if it doesn't exist
-    if(!(Test-Path $scriptPath) -and !$TagData)
-    {
-        return
+    if ($env:FULL_TAG) {
+        $fullTag = $env:FULL_TAG
+    }
+    else {
+        $fullTag = (Get-Date).ToString("yyyyMMdd")
     }
 
     $meta = Get-DockerImageMetaData -Path $metaJsonPath
@@ -458,17 +464,27 @@ function Get-DockerImageMetaDataWrapper
 
     if(!$TagData)
     {
-        # Get the tag data for the image
-        $tagDataFromScript = @(& $scriptPath -CI:$CI.IsPresent @getTagsExtraParams | Where-Object {$_.FromTag})
-        Write-Verbose "tdfs count:$($tagDataFromScript.count)-$($Strict.IsPresent)"
-        if($tagDataFromScript.count -eq 0 -and $Strict.IsPresent)
+        if((Test-Path $scriptPath) )
         {
-            throw "Did not get tag data from script for $scriptPath!"
-        }
+            # Get the tag data for the image
+            $tagDataFromScript = @(& $scriptPath -CI:$CI.IsPresent @getTagsExtraParams | Where-Object {$_.FromTag})
+            Write-Verbose "tdfs count:$($tagDataFromScript.count)-$($Strict.IsPresent)"
+            if($tagDataFromScript.count -eq 0 -and $Strict.IsPresent)
+            {
+                throw "Did not get tag data from script for $scriptPath!"
+            }
 
-        if($TagFilter)
-        {
-            $tagDataFromScript = @($tagDataFromScript | Where-Object { $_.FromTag -match $TagFilter })
+            if($TagFilter)
+            {
+                $tagDataFromScript = @($tagDataFromScript | Where-Object { $_.FromTag -match $TagFilter })
+            }
+        }
+        else {
+            Write-Verbose "getting docker tag list" -Verbose
+            if($shortTags)
+            {
+                $tagDataFromScript = Get-DockerTagList -ShortTag $shortTags -FullTag $fullTag
+            }
         }
     }
     elseif ($meta.TagMapping)