Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docker/tests/Templates/debian.9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ RUN apt-get update \
curl \
apt-transport-https \
locales \
git
git \
&& apt-get clean

# Setup the locale
ENV LANG en_US.UTF-8
Expand All @@ -23,6 +24,6 @@ RUN locale-gen $LANG && update-locale

RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
RUN dpkg -i $PACKAGENAME || :
RUN apt-get install -y -f
RUN apt-get install -y -f --no-install-recommends
RUN $TESTDOWNLOADCOMMAND
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
3 changes: 2 additions & 1 deletion docker/tests/Templates/fxdependent-debian.9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN apt-get update \
ca-certificates \
apt-transport-https \
locales \
git
git \
&& apt-get clean

# Setup the locale
ENV LANG en_US.UTF-8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN apt-get update \
ca-certificates \
apt-transport-https \
locales \
git
git \
&& apt-get clean

# Setup the locale
ENV LANG en_US.UTF-8
Expand Down
6 changes: 4 additions & 2 deletions docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ RUN apt-get update \
ca-certificates \
apt-transport-https \
locales \
git
git \
&& apt-get clean

# Install dotnet-runtime
ADD https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb .
RUN dpkg -i packages-microsoft-prod.deb
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
dotnet-runtime-2.1
dotnet-runtime-2.1 \
&& apt-get clean

# Setup the locale
ENV LANG en_US.UTF-8
Expand Down
3 changes: 2 additions & 1 deletion docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN apt-get update \
ca-certificates \
apt-transport-https \
locales \
git
git \
&& apt-get clean

# Setup the locale
ENV LANG en_US.UTF-8
Expand Down
5 changes: 3 additions & 2 deletions docker/tests/Templates/ubuntu16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ RUN apt-get update \
curl \
apt-transport-https \
locales \
git
git \
&& apt-get clean

# Setup the locale
ENV LANG en_US.UTF-8
Expand All @@ -23,6 +24,6 @@ RUN locale-gen $LANG && update-locale

RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
RUN dpkg -i $PACKAGENAME || :
RUN apt-get install -y -f
RUN apt-get install -y -f --no-install-recommends
RUN $TESTDOWNLOADCOMMAND
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
5 changes: 3 additions & 2 deletions docker/tests/Templates/ubuntu18.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ RUN apt-get update \
curl \
apt-transport-https \
locales \
git
git \
&& apt-get clean

# Setup the locale
ENV LANG en_US.UTF-8
Expand All @@ -23,6 +24,6 @@ RUN locale-gen $LANG && update-locale

RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
RUN dpkg -i $PACKAGENAME || :
RUN apt-get install -y -f
RUN apt-get install -y -f --no-install-recommends
RUN $TESTDOWNLOADCOMMAND
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN apt-get update \
apt-transport-https \
locales \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

COPY PowerShellPackage.ps1 /
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN apt-get update \
apt-transport-https \
locales \
wget \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

COPY PowerShellPackage.ps1 /
Expand Down