Skip to content

Commit fa3f66a

Browse files
adityapatwardhanTravisEz13
authored andcommitted
Update PSHOME path for 7-preview (#233)
1 parent db457e3 commit fa3f66a

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

release/preview/alpine/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
1313
ARG PS_VERSION=6.2.0-preview.3
1414
ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
1515
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
16-
ARG PS_INSTALL_VERSION=6-preview
16+
ARG PS_INSTALL_VERSION=7-preview
1717

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

3636
# Define Args and Env needed to create links
37-
ARG PS_INSTALL_VERSION=6-preview
37+
ARG PS_INSTALL_VERSION=7-preview
3838
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
3939
\
4040
# Define ENVs for Localization/Globalization

release/preview/centos7/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
3333
&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
3434
# remove powershell package
3535
&& rm /tmp/powershell.rpm \
36-
&& ln -sf /opt/microsoft/powershell/6-preview/pwsh /usr/bin/pwsh \
36+
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
3737
# intialize powershell module cache
3838
&& pwsh \
3939
-NoLogo \

release/preview/debian9/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN apt-get update \
3939
&& locale-gen && update-locale \
4040
# remove powershell package
4141
&& rm /tmp/powershell.deb \
42-
&& ln -sf /opt/microsoft/powershell/6-preview/pwsh /usr/bin/pwsh \
42+
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
4343
# intialize powershell module cache
4444
&& pwsh \
4545
-NoLogo \

release/preview/fedora28/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
3333
&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
3434
# remove powershell package
3535
&& rm /tmp/powershell.rpm \
36-
&& ln -sf /opt/microsoft/powershell/6-preview/pwsh /usr/bin/pwsh \
36+
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
3737
# intialize powershell module cache
3838
&& pwsh \
3939
-NoLogo \

release/preview/opensuse423/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
1313
ARG PS_VERSION=6.2.0-preview.3
1414
ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
1515
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
16-
ARG PS_INSTALL_VERSION=6-preview
16+
ARG PS_INSTALL_VERSION=7-preview
1717

1818
# define the folder we will be installing PowerShell to
1919
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
@@ -41,7 +41,7 @@ FROM ${imageRepo}:${fromTag}
4141
COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
4242

4343
# Define Args and Env needed to create links
44-
ARG PS_INSTALL_VERSION=6-preview
44+
ARG PS_INSTALL_VERSION=7-preview
4545
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4646
\
4747
# Define ENVs for Localization/Globalization

release/preview/ubuntu16.04/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN apt-get update \
3636
&& locale-gen $LANG && update-locale \
3737
# remove powershell package
3838
&& rm /tmp/powershell.deb \
39-
&& ln -sf /opt/microsoft/powershell/6-preview/pwsh /usr/bin/pwsh \
39+
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
4040
# intialize powershell module cache
4141
&& pwsh \
4242
-NoLogo \

release/preview/ubuntu18.04/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN apt-get update \
3636
&& locale-gen $LANG && update-locale \
3737
# remove powershell package
3838
&& rm /tmp/powershell.deb \
39-
&& ln -sf /opt/microsoft/powershell/6-preview/pwsh /usr/bin/pwsh \
39+
&& ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \
4040
# intialize powershell module cache
4141
&& pwsh \
4242
-NoLogo \

tests/container.tests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
341341

342342
if($Channel -eq 'preview')
343343
{
344-
$path = '/opt/microsoft/powershell/6-preview/pwsh'
344+
$path = '/opt/microsoft/powershell/7-preview/pwsh'
345345
}
346346

347347
$permissions = Get-DockerImagePwshPermissions -Name $name -Path $path
@@ -360,7 +360,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
360360

361361
if($Channel -eq 'preview')
362362
{
363-
$path = '/opt/microsoft/powershell/6-preview/pwsh'
363+
$path = '/opt/microsoft/powershell/7-preview/pwsh'
364364
}
365365

366366
$permissions = Get-DockerImagePwshPermissions -Name $name -Path $path

0 commit comments

Comments
 (0)