Skip to content

Commit 0baca87

Browse files
authored
Update and fixes OracleLinux gssntlmssp installation (#447)
1 parent fe65867 commit 0baca87

File tree

3 files changed

+18
-29
lines changed

3 files changed

+18
-29
lines changed

Diff for: release/community-stable/oraclelinux/docker/Dockerfile

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@
55
# installed from RHEL7 PowerShell package
66

77
# Define arg(s) needed for the From statement
8-
ARG fromTag=latest
9-
ARG imageRepo=oraclelinux
10-
11-
FROM ${imageRepo}:${fromTag} AS installer-env
8+
FROM oraclelinux: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}-1.rhel.7.x86_64.rpm
1613
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
1714
ARG PS_INSTALL_VERSION=7
1815

1916
# Define Args and Env needed to create links
20-
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
21-
22-
# Define Args and Env needed to create links
23-
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
24-
\
17+
ENV \
18+
PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
2519
# Define ENVs for Localization/Globalization
2620
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
2721
LC_ALL=en_US.UTF-8 \
2822
LANG=en_US.UTF-8 \
2923
# Set up PowerShell module analysis cache path
3024
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
31-
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-${fromTag}
25+
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-OracleLinux-latest
3226

3327
# Installation
3428
RUN \
3529
# download PowerShell rpm package
3630
curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \
31+
# update package list
32+
&& yum update \
3733
# install dependencies
3834
&& yum install -y \
39-
# required for help in powershell
35+
# required for help in powershell
4036
less \
4137
# install EPEL repository
4238
oracle-epel-release-el7 \
43-
# install gssntlmssp package from EPEL repository
39+
# update package list from EPEL repository
40+
&& yum update \
41+
# install dependencies from EPEL repository
42+
&& yum install -y \
43+
# install gssntlmssp package
4444
gssntlmssp \
4545
# install powershell package
4646
&& yum install -y /tmp/powershell-linux.rpm \

Diff for: release/community-stable/oraclelinux/getLatestTag.ps1

-14
This file was deleted.

Diff for: release/community-stable/oraclelinux/meta.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{
22
"IsLinux" : true,
33
"PackageFormat": "powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm",
4-
"SkipGssNtlmSspTests": true,
4+
"SkipGssNtlmSspTests": false,
5+
"shortTags": [
6+
{"Tag": "latest"}
7+
],
58
"tagTemplates": [
69
"#psversion#-oraclelinux-#tag#",
7-
"oraclelinux-#shorttag#"
10+
"oraclelinux"
811
]
912
}

0 commit comments

Comments
 (0)