Build package build using ubuntu 18.04 image (#8666)

This commit is contained in:
Aditya Patwardhan 2019-01-16 15:10:39 -08:00 committed by Travis Plunk
parent a04f6940dd
commit f03cafbdd8
3 changed files with 39 additions and 2 deletions

View File

@ -1552,6 +1552,7 @@ function Start-PSBootstrap {
$Deps += "libunwind8" $Deps += "libunwind8"
if ($Environment.IsUbuntu14) { $Deps += "libicu52" } if ($Environment.IsUbuntu14) { $Deps += "libicu52" }
elseif ($Environment.IsUbuntu16) { $Deps += "libicu55" } elseif ($Environment.IsUbuntu16) { $Deps += "libicu55" }
elseif ($Environment.IsUbuntu18) { $Deps += "libicu60"}
# Packaging tools # Packaging tools
if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" } if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" }

View File

@ -0,0 +1,36 @@
# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
FROM mcr.microsoft.com/powershell:ubuntu-18.04
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
# Install dependencies and clean up
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
apt-utils \
apt-utils \
libc6 \
libcurl4 \
ca-certificates \
libgcc1 \
libicu60 \
libssl1.0.0 \
libstdc++6 \
libtinfo5 \
libunwind8 \
libuuid1 \
libcroco3 \
libgraphite2-3 \
zlib1g \
curl \
git \
apt-transport-https \
locales \
wget \
&& rm -rf /var/lib/apt/lists/*
COPY PowerShellPackage.ps1 /
ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
# Use PowerShell as the default shell
ENTRYPOINT [ "pwsh" ]

View File

@ -262,9 +262,9 @@
"Name": "deb", "Name": "deb",
"RepoDestinationPath": "/PowerShell", "RepoDestinationPath": "/PowerShell",
"BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -TarX64 -TarArm -TarArm64", "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -TarX64 -TarArm -TarArm64",
"DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile", "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_ubuntu18.04/Dockerfile",
"AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"], "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"],
"DockerImageName": "ps-ubunutu-14-04", "DockerImageName": "ps-ubunutu-18-04",
"BinaryBucket": "release" "BinaryBucket": "release"
}, },
{ {