Remove remaining getlatesttag.ps1 files (#533)

* remove remaining getlatesttag.ps1 files

* remove the last fromTag in a  Dockerfile that is used

Author: TravisEz13

release/lts/arm32v7/docker/Dockerfile

@@ -1,10 +1,8 @@
 # Copyright (c) Microsoft Corporation. 
 # Licensed under the MIT License.
 
-ARG fromTag=bionic
-ARG imageRepo=arm32v7/ubuntu
+FROM arm32v7/ubuntu:bionic AS installer-env
 
-FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.3
 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
@@ -39,7 +37,7 @@ RUN ls -l /tmp/powershell.tar.gz
     # Unzip the Linux tar.gz
 RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
 
-FROM ${imageRepo}:${fromTag} AS final-image
+FROM arm32v7/ubuntu:bionic AS final-image
 
 # Define Args and Env needed to create links
 ARG PS_INSTALL_VERSION=7-lts

release/lts/arm32v7/getLatestTag.ps1

@@ -9,6 +9,9 @@
     "tagTemplates": [
         "lts-arm32v7-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"}
+    ],
     "TestProperties": {
         "size": 550,
         "Arm32": true

release/lts/arm32v7/meta.json

@@ -1,24 +1,20 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=7
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:7 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=7
-ARG imageRepo=centos
-
 # Define ENVs for Localization/Globalization
 ENV 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-CentOS-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-7
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \

release/lts/centos7/docker/Dockerfile

@@ -6,6 +6,9 @@
     "tagTemplates": [
         "lts-centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "7"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 550

release/lts/centos7/getLatestTag.ps1

@@ -1,24 +1,20 @@
-# Docker image file that describes an CentOS7 image with PowerShell installed from Microsoft YUM Repo
-ARG fromTag=8
-ARG imageRepo=centos
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM centos:8 AS installer-env
 
 ARG PS_VERSION=7.0.0
 ARG PACKAGE_VERSION=7.0.0
 ARG PS_PACKAGE=powershell-lts-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
 
-ARG fromTag=7
-ARG imageRepo=centos
-
 # Define ENVs for Localization/Globalization
 ENV 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-CentOS-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-CentOS-8
 
 # Install dependencies and clean up
 RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \

release/lts/centos7/meta.json

@@ -6,6 +6,9 @@
     "tagTemplates": [
         "lts-centos-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "8"}
+    ],
     "SubImage": "test-deps",
     "TestProperties": {
         "size": 725

release/lts/centos8/docker/Dockerfile

@@ -1,8 +1,9 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 # Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=16.04
-ARG imageRepo=ubuntu
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+FROM ubuntu:16.04 AS installer-env
 
 ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb

release/lts/centos8/getLatestTag.ps1

@@ -3,10 +3,14 @@
     "UseLinuxVersion": false,
     "PackageFormat": "powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
     "osVersion": "Ubuntu 16.04",
-    "SkipGssNtlmSspTests": false,
     "tagTemplates": [
         "lts-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "xenial"},
+        {"Tag": "16.04"}
+    ],
+    "SkipGssNtlmSspTests": false,
     "TestProperties": {
         "size": 395
     },

release/lts/centos8/meta.json

@@ -1,9 +1,10 @@
-# Docker image file that describes an Ubuntu18.04 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=18.04
-ARG imageRepo=ubuntu
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-FROM ${imageRepo}:${fromTag} AS installer-env
+# Docker image file that describes an Ubuntu image with PowerShell installed from Microsoft APT Repo
+FROM ubuntu:18.04 AS installer-env
 
+# Define Args for the needed to add the package
 ARG PS_VERSION=7.0.0-rc.1
 ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
 ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}

release/lts/ubuntu16.04/docker/Dockerfile

@@ -7,6 +7,10 @@
     "tagTemplates": [
         "lts-ubuntu-#shorttag#"
     ],
+    "shortTags": [
+        {"Tag": "bionic"},
+        {"Tag": "18.04"}
+    ],
     "TestProperties": {
         "size": 355
     },

release/lts/ubuntu16.04/getLatestTag.ps1

@@ -34,7 +34,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
       openssh-clients \
     && yum upgrade-minimal -y --security \
     && yum clean all \
-    # && localedef --charmap=UTF-8 --inputfile=en_US $LANG \
     # remove powershell package
     && rm /tmp/powershell.rpm \
     && ln -sf /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh \

release/lts/ubuntu16.04/meta.json

@@ -12,6 +12,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 723
+        "size": 725
     }
 }

release/lts/ubuntu18.04/docker/Dockerfile

@@ -14,6 +14,8 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-Ubuntu-18.04
+
 # Use PowerShell as the default shell
 # Use array to avoid Docker prepending /bin/sh -c
 CMD [ "pwsh" ]

release/lts/ubuntu18.04/getLatestTag.ps1

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. 
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 #
 # Docker image file that describes an Intel Clear Linux image with PowerShell
@@ -26,7 +26,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
     PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
     # Opt out of SocketsHttpHandler in DotNet Core 2.1 to use HttpClientHandler
     DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
-    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ClearLinux-${fromTag}
+    POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ClearLinux
 
 # Installation
 RUN \