File tree Expand file tree Collapse file tree 9 files changed +21
-9
lines changed Expand file tree Collapse file tree 9 files changed +21
-9
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
27
27
LC_ALL=en_US.UTF-8 \
28
28
LANG=en_US.UTF-8 \
29
29
# 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}
31
32
32
33
# Installation
33
34
RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
Original file line number Diff line number Diff line change @@ -9,6 +9,8 @@ ARG BaseImage=pshorg/powershellcommunity:amazonlinux-2.0
9
9
10
10
FROM ${BaseImage}
11
11
12
+ ARG fromTag=2.0.20181010
13
+
12
14
# Installation
13
15
RUN \
14
16
# install dependencies
@@ -33,6 +35,8 @@ ARG IMAGE_NAME=pshorg/powershellcommunity/test-deps:amazonlinux-2.0.20181114
33
35
ARG VCS_REF="none"
34
36
ARG PS_VERSION=6.1.0
35
37
38
+ ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-TestDeps-AmazonLinux-${fromTag}
39
+
36
40
# Add label last as it's just metadata and uses a lot of parameters
37
41
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
38
42
readme.md="https://github.com/PowerShell/PowerShell/blob/master/docker/README.md" \
Original file line number Diff line number Diff line change @@ -32,7 +32,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
32
32
# with installed libcurl4 package to resolve
33
33
# Invoke-WebRequest : Authentication failed" issue when executing using
34
34
# 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}
36
37
37
38
# Installation
38
39
RUN \
Original file line number Diff line number Diff line change @@ -39,7 +39,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
39
39
# with installed libcurl4 package to resolve
40
40
# Invoke-WebRequest : Authentication failed" issue when executing using
41
41
# 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}
43
44
44
45
# Installation
45
46
RUN \
Original file line number Diff line number Diff line change @@ -74,7 +74,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
74
74
# Set up PowerShell module analysis cache path
75
75
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
76
76
# 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}
78
79
79
80
RUN \
80
81
# install dependencies
Original file line number Diff line number Diff line change @@ -41,10 +41,11 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
41
41
# Set up PowerShell module analysis cache path
42
42
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
43
43
# 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
45
45
# Invoke-WebRequest : Authentication failed" issue when executing using
46
46
# 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}
48
49
49
50
# Installation
50
51
RUN \
Original file line number Diff line number Diff line change @@ -27,7 +27,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
27
27
LC_ALL=en_US.UTF-8 \
28
28
LANG=en_US.UTF-8 \
29
29
# 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}
31
32
32
33
# Installation
33
34
RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
Original file line number Diff line number Diff line change @@ -41,7 +41,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
41
41
# with installed libcurl4 package to resolve
42
42
# Invoke-WebRequest : Authentication failed" issue when executing using
43
43
# 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}
45
46
46
47
# Installation
47
48
RUN \
Original file line number Diff line number Diff line change @@ -59,7 +59,8 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
59
59
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
60
60
# Set terminal to linux because there is no xterm library in Photon image
61
61
# when docker allocate pseudo-tty
62
- TERM=linux
62
+ TERM=linux \
63
+ POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Photon-${fromTag}
63
64
64
65
# Installation
65
66
RUN \
You can’t perform that action at this time.
0 commit comments