Skip to content

Make tests that rely on executable path use common code to calculate path #376

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
TravisEz13 merged 7 commits into from
Feb 14, 2020
Merged

Make tests that rely on executable path use common code to calculate path #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da3ebaf
Fix tests
TravisEz13 Feb 14, 2020
3836942
Fix lts images
TravisEz13 Feb 14, 2020
28b9c93
Add test to figure out what is wrong
TravisEz13 Feb 14, 2020
f28806d
Add test to figure out what is wrong - part 2
TravisEz13 Feb 14, 2020
9170c6d
remove preview reference from LTS
TravisEz13 Feb 14, 2020
d755000
make lts in 7-lts version folder like package
TravisEz13 Feb 14, 2020
865e1d7
Update tests/container.tests.ps1
TravisEz13 Feb 14, 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
14 changes: 7 additions & 7 deletions release/lts/alpine38/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ ARG imageRepo=alpine
FROM ${imageRepo}:${fromTag} AS installer-env

# Define Args for the needed to add the package
ARG PS_VERSION=7.0.0-preview.1
ARG PS_VERSION=7.0.0
ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-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
ARG PS_INSTALL_VERSION=7-lts

# Download the Linux tar.gz and save it
ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
Expand All @@ -34,7 +34,7 @@ FROM ${imageRepo}:${fromTag}
COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]

# Define Args and Env needed to create links
ARG PS_INSTALL_VERSION=7-preview
ARG PS_INSTALL_VERSION=7-lts
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
\
# Define ENVs for Localization/Globalization
Expand Down Expand Up @@ -69,8 +69,8 @@ RUN apk add --no-cache \
# Create the pwsh symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
\
# Create the pwsh-preview symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
# Create the pwsh-lts symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
# Give all user execute permissions and remove write permissions for others
&& chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
# intialize powershell module cache
Expand All @@ -86,8 +86,8 @@ RUN apk add --no-cache \
}"

# Define args needed only for the labels
ARG PS_VERSION=6.2.0-preview.2
ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.8
ARG PS_VERSION=6.2.0
ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
ARG VCS_REF="none"

# Add label last as it's just metadata and uses a lot of parameters
Expand Down
14 changes: 7 additions & 7 deletions release/lts/alpine39/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ ARG imageRepo=alpine
FROM ${imageRepo}:${fromTag} AS installer-env

# Define Args for the needed to add the package
ARG PS_VERSION=7.0.0-preview.1
ARG PS_VERSION=7.0.0
ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-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
ARG PS_INSTALL_VERSION=7-lts

# Download the Linux tar.gz and save it
ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
Expand All @@ -36,7 +36,7 @@ ARG fromTag=3.9
COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]

# Define Args and Env needed to create links
ARG PS_INSTALL_VERSION=7-preview
ARG PS_INSTALL_VERSION=7-lts
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
\
# Define ENVs for Localization/Globalization
Expand Down Expand Up @@ -71,8 +71,8 @@ RUN apk add --no-cache \
# Create the pwsh symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
\
# Create the pwsh-preview symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
# Create the pwsh-lts symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
# Give all user execute permissions and remove write permissions for others
&& chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
# intialize powershell module cache
Expand All @@ -88,8 +88,8 @@ RUN apk add --no-cache \
}"

# Define args needed only for the labels
ARG PS_VERSION=6.2.0-preview.2
ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-alpine-3.8
ARG PS_VERSION=7.0.0
ARG IMAGE_NAME=mcr.microsoft.com/powershell:alpine-3.8
ARG VCS_REF="none"

# Add label last as it's just metadata and uses a lot of parameters
Expand Down
10 changes: 5 additions & 5 deletions release/lts/arm32v7/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
ARG PS_VERSION=6.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-preview
ARG PS_INSTALL_VERSION=7-lts

# define the folder we will be installing PowerShell to
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
Expand Down Expand Up @@ -42,7 +42,7 @@ RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER}
FROM ${imageRepo}:${fromTag} AS final-image

# Define Args and Env needed to create links
ARG PS_INSTALL_VERSION=7-preview
ARG PS_INSTALL_VERSION=7-lts
ARG PS_VERSION=6.2.3

ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
Expand All @@ -67,12 +67,12 @@ RUN \
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 \
# Create the pwsh-preview symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview
# Create the pwsh-lts symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts

# Define args needed only for the labels
ARG VCS_REF="none"
ARG IMAGE_NAME=mcr.microsoft.com/powershell:preview-arm32v7-ubuntu-bionic
ARG IMAGE_NAME=mcr.microsoft.com/powershell:arm32v7-ubuntu-bionic

LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
Expand Down
9 changes: 4 additions & 5 deletions release/lts/centos7/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ARG imageRepo=centos

FROM ${imageRepo}:${fromTag} AS installer-env

ARG PS_VERSION=7.0.0-preview.1
ARG PACKAGE_VERSION=7.0.0_preview.1
ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
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
Expand Down Expand Up @@ -37,7 +37,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
# remove powershell package
&& rm /tmp/powershell.rpm \
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
# intialize powershell module cache
&& pwsh \
-NoLogo \
Expand Down Expand Up @@ -72,4 +71,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \

# Use PowerShell as the default shell
# Use array to avoid Docker prepending /bin/sh -c
CMD [ "pwsh-preview" ]
CMD [ "pwsh" ]
2 changes: 1 addition & 1 deletion release/lts/centos7/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
"PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
"osVersion": "CentOS 7",
"tagTemplates": [
"lts-centos-#shorttag#"
Expand Down
9 changes: 4 additions & 5 deletions release/lts/centos8/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ARG imageRepo=centos

FROM ${imageRepo}:${fromTag} AS installer-env

ARG PS_VERSION=7.0.0-preview.1
ARG PACKAGE_VERSION=7.0.0_preview.1
ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
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
Expand Down Expand Up @@ -38,7 +38,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
&& yum clean all \
# remove powershell package
&& rm /tmp/powershell.rpm \
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
# intialize powershell module cache
&& pwsh \
-NoLogo \
Expand Down Expand Up @@ -73,4 +72,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \

# Use PowerShell as the default shell
# Use array to avoid Docker prepending /bin/sh -c
CMD [ "pwsh-preview" ]
CMD [ "pwsh" ]
2 changes: 1 addition & 1 deletion release/lts/centos8/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
"PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
"osVersion": "CentOS 8",
"tagTemplates": [
"lts-centos-#shorttag#"
Expand Down
10 changes: 6 additions & 4 deletions release/lts/debian10/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
ARG PS_VERSION=6.2.3
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
ARG PS_INSTALL_VERSION=7-lts

# Download the Linux tar.gz and save it
ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
Expand All @@ -25,14 +25,14 @@ 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 ${imageRepo}:${fromTag}

ARG PS_VERSION=6.2.0-preview.3
ARG PS_INSTALL_VERSION=7-preview
ARG PS_VERSION=7.0.0
ARG PS_INSTALL_VERSION=7-lts

# 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
ARG PS_INSTALL_VERSION=7-lts
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
\
# Define ENVs for Localization/Globalization
Expand Down Expand Up @@ -73,6 +73,8 @@ RUN apt-get update \
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 \
# Create the pwsh-lts symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
# intialize powershell module cache
&& pwsh \
-NoLogo \
Expand Down
2 changes: 1 addition & 1 deletion release/lts/debian10/test-deps/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Docker image file that describes an Debian image with PowerShell and test dependencies
ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-10
ARG BaseImage=mcr.microsoft.com/powershell:debian-10

FROM ${BaseImage}

Expand Down
10 changes: 6 additions & 4 deletions release/lts/debian11/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
ARG PS_VERSION=6.2.3
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
ARG PS_INSTALL_VERSION=7-lts

# Download the Linux tar.gz and save it
ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
Expand All @@ -25,14 +25,14 @@ 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 ${imageRepo}:${fromTag}

ARG PS_VERSION=6.2.0-preview.3
ARG PS_INSTALL_VERSION=7-preview
ARG PS_VERSION=7.0.0
ARG PS_INSTALL_VERSION=7-lts

# 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
ARG PS_INSTALL_VERSION=7-lts
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
\
# Define ENVs for Localization/Globalization
Expand Down Expand Up @@ -73,6 +73,8 @@ RUN apt-get update \
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 \
# Create the pwsh-lts symbolic link that points to powershell
&& ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-lts \
# intialize powershell module cache
&& pwsh \
-NoLogo \
Expand Down
2 changes: 1 addition & 1 deletion release/lts/debian11/test-deps/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Docker image file that describes an Debian image with PowerShell and test dependencies
ARG BaseImage=mcr.microsoft.com/powershell:preview-debian-11
ARG BaseImage=mcr.microsoft.com/powershell:debian-11

FROM ${BaseImage}

Expand Down
5 changes: 2 additions & 3 deletions release/lts/debian9/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ARG imageRepo=debian

FROM ${imageRepo}:${fromTag} AS installer-env

ARG PS_VERSION=7.0.0-preview.1
ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.debian.9_amd64.deb
ARG PS_VERSION=7.0.0
ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.debian.9_amd64.deb
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}

# Define ENVs for Localization/Globalization
Expand Down Expand Up @@ -41,7 +41,6 @@ RUN apt-get update \
&& locale-gen && update-locale \
# remove powershell package
&& rm /tmp/powershell.deb \
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
Copy link

@anmenaga anmenaga Feb 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unlike other Debians in this PR, here creation of '/usr/bin/pwsh' sym link is remoevd and /usr/bin/pwsh-lts is not created. Why?

Copy link

@anmenaga anmenaga Feb 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same for all lts ubuntu dockerfiles in this PR.

Copy link
Member Author

@TravisEz13 TravisEz13 Feb 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deb file creates it here.

# intialize powershell module cache
&& pwsh \
-NoLogo \
Expand Down
2 changes: 1 addition & 1 deletion release/lts/debian9/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IsLinux" : true,
"UseLinuxVersion" : false,
"PackageFormat": "powershell-preview_${PS_VERSION}-1.debian.9_amd64.deb",
"PackageFormat": "powershell-lts_${PS_VERSION}-1.debian.9_amd64.deb",
"osVersion": "Debian 9",
"SkipGssNtlmSspTests": false,
"tagTemplates": [
Expand Down
9 changes: 4 additions & 5 deletions release/lts/fedora/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ARG imageRepo=fedora

FROM ${imageRepo}:${fromTag} AS installer-env

ARG PS_VERSION=7.0.0-preview.1
ARG PACKAGE_VERSION=7.0.0_preview.1
ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm
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=28
Expand Down Expand Up @@ -35,7 +35,6 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
ca-certificates \
gssntlmssp \
&& echo "end - misc packages" \
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
&& echo "starting FEDORA-2019-27e7b92407" \
# For whatever reason FEDORA-2019-27e7b92407 has to be patched manually
# to do this, upgrade libmodulemd1, if it is installed
Expand Down Expand Up @@ -108,4 +107,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \

# Use PowerShell as the default shell
# Use array to avoid Docker prepending /bin/sh -c
CMD [ "pwsh-preview" ]
CMD [ "pwsh" ]
2 changes: 1 addition & 1 deletion release/lts/fedora/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm",
"PackageFormat": "powershell-lts-${PS_VERSION}-1.rhel.7.x86_64.rpm",
"osVersion": "Fedora",
"SkipGssNtlmSspTests": false,
"tagTemplates": [
Expand Down
5 changes: 2 additions & 3 deletions release/lts/ubuntu16.04/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG imageRepo=ubuntu
FROM ${imageRepo}:${fromTag} AS installer-env

ARG PS_VERSION=7.0.0-rc.1
ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
ARG PS_PACKAGE=powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}

# Define ENVs for Localization/Globalization
Expand Down Expand Up @@ -38,7 +38,6 @@ RUN apt-get update \
&& locale-gen $LANG && update-locale \
# remove powershell package
&& rm /tmp/powershell.deb \
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
# intialize powershell module cache
&& pwsh \
-NoLogo \
Expand Down Expand Up @@ -73,4 +72,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \

# Use PowerShell as the default shell
# Use array to avoid Docker prepending /bin/sh -c
CMD [ "pwsh-preview" ]
CMD [ "pwsh" ]
2 changes: 1 addition & 1 deletion release/lts/ubuntu16.04/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${previewTag}_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
"PackageFormat": "powershell-lts_${PS_VERSION}-1.ubuntu.16.04_amd64.deb",
"osVersion": "Ubuntu 16.04",
"SkipGssNtlmSspTests": false,
"tagTemplates": [
Expand Down
5 changes: 2 additions & 3 deletions release/lts/ubuntu18.04/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG imageRepo=ubuntu
FROM ${imageRepo}:${fromTag} AS installer-env

ARG PS_VERSION=7.0.0-rc.1
ARG PS_PACKAGE=powershell-preview_${PS_VERSION}-1.ubuntu.18.04_amd64.deb
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}

# Define ENVs for Localization/Globalization
Expand Down Expand Up @@ -38,7 +38,6 @@ RUN apt-get update \
&& locale-gen $LANG && update-locale \
# remove powershell package
&& rm /tmp/powershell.deb \
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
# intialize powershell module cache
&& pwsh \
-NoLogo \
Expand Down Expand Up @@ -73,4 +72,4 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \

# Use PowerShell as the default shell
# Use array to avoid Docker prepending /bin/sh -c
CMD [ "pwsh-preview" ]
CMD [ "pwsh" ]
Loading