Updates to fedora27 and kalilinux dockerfiles (#6819)

This PR addresses 2 issues:

fedora27 dockerfiles were missing compat-openssl10 prerequisite that on Linux-based Docker hosts produced error No usable version of the libssl was found during Restore-PSPester.
kalilinux PS package validation is failing because of open issue #5413 , so disabling this config for now.
This commit is contained in:
Andrew
2018-05-07 13:02:01 -07:00
committed by Travis Plunk
parent d96a321b49
commit e0ee13c699
5 changed files with 10 additions and 31 deletions
+1
View File
@@ -26,6 +26,7 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
RUN dnf install -y \
curl \
glibc-locale-source \
&& dnf upgrade-minimal -y --security \
&& dnf clean all
# Setup the locale
+2
View File
@@ -26,6 +26,8 @@ LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
RUN dnf install -y \
curl \
glibc-locale-source \
compat-openssl10 \
&& dnf upgrade-minimal -y --security \
&& dnf clean all
# Setup the locale
+3 -1
View File
@@ -10,7 +10,9 @@ RUN dnf install -y \
curl \
glibc-locale-source \
compat-openssl10 \
git
git \
&& dnf upgrade-minimal -y --security \
&& dnf clean all
# Setup the locale
ENV LANG en_US.UTF-8
+4 -1
View File
@@ -9,7 +9,10 @@ ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
RUN dnf install -y \
curl \
glibc-locale-source \
git
git \
compat-openssl10 \
&& dnf upgrade-minimal -y --security \
&& dnf clean all
# Setup the locale
ENV LANG en_US.UTF-8
@@ -1,29 +0,0 @@
FROM kalilinux/kali-linux-docker:latest
ARG PSVERSIONSTUB=6.0.2
ARG PACKAGELOCATIONSTUB
ARG TESTLISTSTUB=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
ARG GITLOCATION=https://github.com/PowerShell/PowerShell.git
# Install dependencies
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
apt-utils \
ca-certificates \
curl \
apt-transport-https \
locales \
git
# Setup the locale
ENV LANG en_US.UTF-8
ENV LC_ALL $LANG
RUN locale-gen $LANG && update-locale
RUN curl -L -o libssl1.0.0_1.0.1t-1+deb8u7_amd64.deb http://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u7_amd64.deb
RUN curl -L -o powershell_$PSVERSIONSTUB-1.ubuntu.16.04_amd64.deb $PACKAGELOCATIONSTUB/powershell_$PSVERSIONSTUB-1.ubuntu.16.04_amd64.deb
RUN dpkg -i libssl1.0.0_1.0.1t-1+deb8u7_amd64.deb || :
RUN dpkg -i powershell_$PSVERSIONSTUB-1.ubuntu.16.04_amd64.deb || :
RUN apt-get install -y -f
RUN git clone --recursive $GITLOCATION
RUN pwsh -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLISTSTUB -PassThru).FailedCount"