Skip to content

Commit 5acd011

Browse files
adityapatwardhanmsftbot[bot]
authored and
msftbot[bot]
committed
Add dist channel to community (#266)
* Add POWERSHELL_DISTRIBUTION_CHANNEL to community images * Fix amazon linux test deps
1 parent 8da8107 commit 5acd011

File tree

9 files changed

+21
-9
lines changed

9 files changed

+21
-9
lines changed

release/community-stable/amazonlinux/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
2727
LC_ALL=en_US.UTF-8 \
2828
LANG=en_US.UTF-8 \
2929
# Set up PowerShell module analysis cache path
30-
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
30+
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
31+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-AmazonLinux-${fromTag}
3132

3233
# Installation
3334
RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \

release/community-stable/amazonlinux/test-deps/docker/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ARG BaseImage=pshorg/powershellcommunity:amazonlinux-2.0
99

1010
FROM ${BaseImage}
1111

12+
ARG fromTag=2.0.20181010
13+
1214
# Installation
1315
RUN \
1416
# install dependencies
@@ -33,6 +35,8 @@ ARG IMAGE_NAME=pshorg/powershellcommunity/test-deps:amazonlinux-2.0.20181114
3335
ARG VCS_REF="none"
3436
ARG PS_VERSION=6.1.0
3537

38+
ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-AmazonLinux-${fromTag}
39+
3640
# Add label last as it's just metadata and uses a lot of parameters
3741
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
3842
readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \

release/community-stable/archlinux/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
3232
# with installed libcurl4 package to resolve
3333
# Invoke-WebRequest : Authentication failed" issue when executing using
3434
# docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
35-
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
35+
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
36+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ArchLinux-${fromTag}
3637

3738
# Installation
3839
RUN \

release/community-stable/blackarch/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
3939
# with installed libcurl4 package to resolve
4040
# Invoke-WebRequest : Authentication failed" issue when executing using
4141
# docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
42-
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
42+
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
43+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-BlackArch-${fromTag}
4344

4445
# Installation
4546
RUN \

release/community-stable/clearlinux/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
7474
# Set up PowerShell module analysis cache path
7575
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
7676
# Opt out of SocketsHttpHandler in DotNet Core 2.1 to use HttpClientHandler
77-
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
77+
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
78+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-ClearLinux-${fromTag}
7879

7980
RUN \
8081
# install dependencies

release/community-stable/kali-rolling/docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4141
# Set up PowerShell module analysis cache path
4242
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
4343
# Opt out of SocketsHttpHandler in DotNet Core 2.1 to use HttpClientHandler
44-
# with installed libcurl4 package to resolve
44+
# with installed libcurl4 package to resolve
4545
# Invoke-WebRequest : Authentication failed" issue when executing using
4646
# docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
47-
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
47+
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
48+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-KaliLinux-${fromTag}
4849

4950
# Installation
5051
RUN \

release/community-stable/oraclelinux/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
2727
LC_ALL=en_US.UTF-8 \
2828
LANG=en_US.UTF-8 \
2929
# Set up PowerShell module analysis cache path
30-
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache
30+
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
31+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-${fromTag}
3132

3233
# Installation
3334
RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \

release/community-stable/parrot/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4141
# with installed libcurl4 package to resolve
4242
# Invoke-WebRequest : Authentication failed" issue when executing using
4343
# docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
44-
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
44+
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
45+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Parrot-${fromTag}
4546

4647
# Installation
4748
RUN \

release/community-stable/photon/docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
5959
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
6060
# Set terminal to linux because there is no xterm library in Photon image
6161
# when docker allocate pseudo-tty
62-
TERM=linux
62+
TERM=linux \
63+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Photon-${fromTag}
6364

6465
# Installation
6566
RUN \

0 commit comments

Comments
 (0)