Skip to content

Commit 743ca51

Browse files
authored
Update and fixes Photon terminal keyboard issue (#446)
1 parent bdd89c4 commit 743ca51

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

release/community-stable/photon/docker/Dockerfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
# installed from full PowerShell linux tar.gz package
66

77
# Define arg(s) needed for the From statement
8-
ARG fromTag=2.0-20181017
9-
ARG imageRepo=photon
10-
11-
FROM ${imageRepo}:${fromTag} AS installer-env
8+
FROM photon:latest AS installer-env
129

1310
# Define Args for the needed to add the package
14-
ARG PS_VERSION=6.2.3
11+
ARG PS_VERSION=7.0.1
1512
ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
1613
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
1714
ARG PS_INSTALL_VERSION=7
@@ -36,13 +33,13 @@ RUN \
3633
&& tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER}
3734

3835
# Start a new stage so we lose all the tar.gz layers from the final image
39-
FROM ${imageRepo}:${fromTag}
36+
FROM photon:latest
4037

4138
# Copy only the files we need from the previous stage
4239
COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
4340

4441
# Define Args and Env needed to create links
45-
ARG PS_VERSION=6.1.0
42+
ARG PS_VERSION=7.0.1
4643
ARG PS_INSTALL_VERSION=7
4744
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
4845
\
@@ -57,10 +54,7 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
5754
# Invoke-WebRequest : Authentication failed" issue when executing using
5855
# docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [Invoke-WebRequest] [-Uri <HTTPS URL>]
5956
DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \
60-
# Set terminal to linux because there is no xterm library in Photon image
61-
# when docker allocate pseudo-tty
62-
TERM=linux \
63-
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Photon-${fromTag}
57+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Photon-latest
6458

6559
# Installation
6660
RUN \
@@ -76,6 +70,8 @@ RUN \
7670
icu \
7771
# required for help in powershell
7872
less \
73+
# required for xterm library
74+
ncurses-terminfo-6.1-2.ph3.x86_64 \
7975
# generate locale
8076
&& locale-gen.sh \
8177
# create the pwsh symbolic link that points to powershell

release/community-stable/photon/getLatestTag.ps1

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"IsLinux" : true,
3-
"SkipWebCmdletTests": true,
3+
"SkipWebCmdletTests": false,
44
"PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
55
"SkipGssNtlmSspTests": true,
6+
"shortTags": [
7+
{"Tag": "latest"}
8+
],
69
"tagTemplates": [
710
"#psversion#-photon-#tag#",
8-
"photon-#shorttag#"
11+
"photon"
912
]
1013
}

0 commit comments

Comments
 (0)