diff --git a/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile b/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile deleted file mode 100644 index c7b230d75..000000000 --- a/release/7-2/ubuntu18.04-arm32v7/docker/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. - -FROM --platform=linux/arm/v7 ubuntu:bionic AS installer-env - -ARG PS_VERSION=7.2.3 -ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz -ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} -ARG PS_INSTALL_VERSION=7 - -# 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} - -ARG PS_PACKAGE_URL_BASE64 - -RUN apt-get update \ - && apt-get install --no-install-recommends ca-certificates wget --yes - -RUN echo 'in task' \ - && if [ -n "${PS_PACKAGE_URL_BASE64}" ]; then \ - echo 'using base64' \ - && export url=$(echo "${PS_PACKAGE_URL_BASE64}" | base64 --decode -);\ - else \ - echo 'using unencoded' \ - && export url="${PS_PACKAGE_URL}"; \ - fi \ - && echo "url: $url" \ - && wget -O /tmp/powershell.tar.gz "$url" \ - && echo 'task done' - -RUN ls -l /tmp/powershell.tar.gz - - # Unzip the Linux tar.gz -RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER} - -FROM --platform=linux/arm/v7 ubuntu:bionic AS final-image - -# Define Args and Env needed to create links -ARG PS_INSTALL_VERSION=7 -ARG PS_VERSION=7.2.3 - -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-arm32v7-Ubuntu-18.04 - -# Copy only the files we need from the previous stage -COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"] - - -RUN \ - apt-get update \ - && apt-get install --no-install-recommends ca-certificates libunwind8 libssl1.0 libicu60 less --yes - - # 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 - -# Use PowerShell as the default shell -# Use array to avoid Docker prepending /bin/sh -c -CMD [ "pwsh" ] diff --git a/release/7-2/ubuntu18.04-arm32v7/meta.json b/release/7-2/ubuntu18.04-arm32v7/meta.json deleted file mode 100644 index d32f92acf..000000000 --- a/release/7-2/ubuntu18.04-arm32v7/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "IsLinux" : true, - "UseLinuxVersion": false, - "PackageFormat": "powershell-${PS_VERSION}-linux-arm32.tar.gz", - "osVersion": "Ubuntu 18.04 ARM 32v7", - "SkipGssNtlmSspTests": true, - "ShortDistroName": "ubuntu", - "Base64EncodePackageUrl": true, - "UseAcr": false, - "tagTemplates": [ - "#psversion#-ubuntu-#shorttag#-arm32", - "ubuntu-#shorttag#-arm32" - ], - "shortTags": [ - {"Tag": "bionic"}, - {"Tag": "18.04"} - ], - "TestProperties": { - "size": 550, - "Arm32": true - }, - "EndOfLife": "2023-04-02", - "DistributionState": "Validated", - "UseInCi": false, - "Architecture": "arm32" -} diff --git a/release/7-2/ubuntu18.04/docker/Dockerfile b/release/7-2/ubuntu18.04/docker/Dockerfile deleted file mode 100644 index 72cd2c65f..000000000 --- a/release/7-2/ubuntu18.04/docker/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. - -# 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=6.2.0 -ARG PS_PACKAGE=powershell_${PS_VERSION}-1.deb_amd64.deb -ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} - -# 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-Ubuntu-18.04 - -# Install dependencies and clean up -RUN apt-get update \ - && apt-get install --no-install-recommends -y \ - # curl is required to grab the Linux package - curl \ - # less is required for help in powershell - less \ - # requied to setup the locale - locales \ - # required for SSL - ca-certificates \ - gss-ntlmssp \ - # PowerShell remoting over SSH dependencies - openssh-client \ - # Download the Linux package and save it - && echo ${PS_PACKAGE_URL} \ - && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \ - && apt-get install --no-install-recommends -y /tmp/powershell.deb \ - && apt-get dist-upgrade -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ - && locale-gen $LANG && update-locale \ - # remove powershell package - && rm /tmp/powershell.deb \ - # intialize powershell module cache - # and disable telemetry - && export POWERSHELL_TELEMETRY_OPTOUT=1 \ - && pwsh \ - -NoLogo \ - -NoProfile \ - -Command " \ - \$ErrorActionPreference = 'Stop' ; \ - \$ProgressPreference = 'SilentlyContinue' ; \ - while(!(Test-Path -Path \$env:PSModuleAnalysisCachePath)) { \ - Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \ - Start-Sleep -Seconds 6 ; \ - }" - -# Use PowerShell as the default shell -# Use array to avoid Docker prepending /bin/sh -c -CMD [ "pwsh" ] diff --git a/release/7-2/ubuntu18.04/meta.json b/release/7-2/ubuntu18.04/meta.json deleted file mode 100644 index 845a73c96..000000000 --- a/release/7-2/ubuntu18.04/meta.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "IsLinux" : true, - "UseLinuxVersion": false, - "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb", - "osVersion": "Ubuntu 18.04", - "SkipGssNtlmSspTests": false, - "tagTemplates": [ - "#psversion#-ubuntu-#shorttag#", - "ubuntu-#shorttag#" - ], - "shortTags": [ - {"Tag": "bionic"}, - {"Tag": "18.04"} - ], - "TestProperties": { - "size": 355 - }, - "SubImage": "test-deps", - "EndOfLife": "2023-04-02", - "DistributionState": "Validated" -} diff --git a/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile b/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile deleted file mode 100644 index c8e9e805a..000000000 --- a/release/7-2/ubuntu18.04/test-deps/docker/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# Docker image file that describes an Ubuntu image with PowerShell and test dependencies -ARG BaseImage=mcr.microsoft.com/powershell:ubuntu-18.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 \ - git \ - unzip \ - && 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" ] diff --git a/release/7-2/ubuntu18.04/test-deps/meta.json b/release/7-2/ubuntu18.04/test-deps/meta.json deleted file mode 100644 index f1002d00c..000000000 --- a/release/7-2/ubuntu18.04/test-deps/meta.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "IsLinux" : true, - "UseLinuxVersion": false, - "osVersion": "Ubuntu 18.04", - "tagTemplates": [ - "ubuntu-#shorttag#" - ], - "SubRepository": "test-deps", - "OptionalTests": [ - "test-deps", - "test-deps-debian" - ], - "TestProperties": { - "size": 380 - } -}