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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ RUN \
sudo \
# add su
util-linux \
iputils \
hostname \
procps \
wget \
openssl \
tar \
&& yum clean all \
# remove cache folders and files
&& rm -rf /var/cache/yum
Expand Down
7 changes: 6 additions & 1 deletion release/preview/alpine/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node
COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}

RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
&& apk add bash sudo shadow \
&& apk add \
bash \
sudo \
shadow \
openssl \
curl \
&& apk del .pipeline-deps \
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
Expand Down
7 changes: 4 additions & 3 deletions release/preview/centos7/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
# Update now that we have epel-release
&& yum update -y \
# Install libraries for NTLM support
&& yum install -y gssntlmssp \
# less is required for help in powershell
less \
&& yum install -y \
gssntlmssp \
# less is required for help in powershell
less \
&& yum upgrade-minimal -y --security \
&& yum clean all \
&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
Expand Down
5 changes: 4 additions & 1 deletion release/preview/centos7/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ ARG BaseImage=mcr.microsoft.com/powershell:centos-7
FROM ${BaseImage}

# Install dependencies and clean up
RUN yum install -y sudo \
RUN yum install -y \
sudo \
wget \
openssl \
&& yum clean all

# Define args needed only for the labels
Expand Down
5 changes: 5 additions & 0 deletions release/preview/debian9/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ FROM ${BaseImage}
RUN apt-get update \
&& apt-get install -y \
sudo \
curl \
wget \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wget 😻

iputils-ping \
iputils-tracepath \
procps \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
9 changes: 5 additions & 4 deletions release/preview/fedora28/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
&& dnf install -y /tmp/powershell.rpm \
&& dnf install -y \
# less is needed for help
less \
# less is needed for help
less \
# Needed to run localdef
glibc-locale-source \
# Invoke-WebRequest doesn't work correctly without this
compat-openssl10 \
gssntlmssp \
compat-openssl10 \
ca-certificates \
gssntlmssp \
&& dnf upgrade-minimal -y --security \
&& dnf clean all \
&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
Expand Down
8 changes: 7 additions & 1 deletion release/preview/fedora28/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ ARG BaseImage=mcr.microsoft.com/powershell:fedora-28
FROM ${BaseImage}

# Install dependencies and clean up
RUN dnf install -y sudo \
RUN dnf install -y \
sudo \
findutils \
hostname \
iputils \
wget \
procps-ng \
&& dnf clean all

# Define args needed only for the labels
Expand Down
4 changes: 4 additions & 0 deletions release/preview/opensuse423/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ FROM ${BaseImage}
RUN zypper --non-interactive update --skip-interactive \
&& zypper --non-interactive install \
sudo \
tar \
curl \
wget \
hostname \
# clean package manager cache
&& zypper clean -a \
# remove package manager log file
Expand Down
4 changes: 4 additions & 0 deletions release/preview/ubuntu16.04/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ FROM ${BaseImage}
RUN apt-get update \
&& apt-get install -y \
sudo \
curl \
wget \
iputils-ping \
iputils-tracepath \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
4 changes: 4 additions & 0 deletions release/preview/ubuntu18.04/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ FROM ${BaseImage}
RUN apt-get update \
&& apt-get install -y \
sudo \
curl \
wget \
iputils-ping \
iputils-tracepath \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
7 changes: 6 additions & 1 deletion release/stable/alpine/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/node
COPY --from=node /opt/yarn-v${YARN_VERSION} /opt/yarn-v${YARN_VERSION}

RUN apk add --no-cache --virtual .pipeline-deps readline linux-pam \
&& apk add bash sudo shadow \
&& apk add \
bash \
sudo \
shadow \
openssl \
curl \
&& apk del .pipeline-deps \
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg
Expand Down
7 changes: 4 additions & 3 deletions release/stable/centos7/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \
# Update now that we have epel-release
&& yum update -y \
# Install libraries for NTLM support
&& yum install -y gssntlmssp \
# less is required for help in powershell
less \
&& yum install -y \
gssntlmssp \
# less is required for help in powershell
less \
&& yum upgrade-minimal -y --security \
&& yum clean all \
&& localedef --charmap=UTF-8 --inputfile=en_US $LANG \
Expand Down
5 changes: 4 additions & 1 deletion release/stable/centos7/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ ARG BaseImage=mcr.microsoft.com/powershell:centos-7
FROM ${BaseImage}

# Install dependencies and clean up
RUN yum install -y sudo \
RUN yum install -y \
sudo \
wget \
openssl \
&& yum clean all

# Define args needed only for the labels
Expand Down
5 changes: 5 additions & 0 deletions release/stable/debian9/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ FROM ${BaseImage}
RUN apt-get update \
&& apt-get install -y \
sudo \
curl \
wget \
iputils-ping \
iputils-tracepath \
procps \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
8 changes: 7 additions & 1 deletion release/stable/fedora28/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ ARG BaseImage=mcr.microsoft.com/powershell:fedora-28
FROM ${BaseImage}

# Install dependencies and clean up
RUN dnf install -y sudo \
RUN dnf install -y \
sudo \
findutils \
hostname \
iputils \
wget \
procps-ng \
&& dnf clean all

# Define args needed only for the labels
Expand Down
4 changes: 4 additions & 0 deletions release/stable/opensuse423/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ FROM ${BaseImage}
RUN zypper --non-interactive update --skip-interactive \
&& zypper --non-interactive install \
sudo \
tar \
curl \
wget \
hostname \
# clean package manager cache
&& zypper clean -a \
# remove package manager log file
Expand Down
4 changes: 4 additions & 0 deletions release/stable/ubuntu16.04/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ FROM ${BaseImage}
RUN apt-get update \
&& apt-get install -y \
sudo \
curl \
wget \
iputils-ping \
iputils-tracepath \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
4 changes: 4 additions & 0 deletions release/stable/ubuntu18.04/test-deps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ FROM ${BaseImage}
RUN apt-get update \
&& apt-get install -y \
sudo \
curl \
wget \
iputils-ping \
iputils-tracepath \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
8 changes: 4 additions & 4 deletions tests/container.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,8 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
BeforeAll{
#apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps
$commands = @(
'locale-gen'
'update-ca-certificates'
'openssl'
#'locale-gen'
# debian 'update-ca-certificates'
'less'
)

Expand Down Expand Up @@ -358,7 +357,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
BeforeAll{
#apt-utils ca-certificates curl wget apt-transport-https locales gnupg2 inetutils-ping git sudo less procps
$commands = @(
@{command = 'adduser'}
#@{command = 'adduser'}
@{command = 'bash'}
@{command = 'curl'}
@{command = 'find'}
Expand All @@ -369,6 +368,7 @@ Describe "Linux Containers" -Tags 'Behavior', 'Linux' {
@{command = 'sudo'}
@{command = 'tar'}
@{command = 'wget'}
@{command = 'openssl'}
)

$debianCommands = @(
Expand Down
2 changes: 1 addition & 1 deletion tests/containerTestCommon.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ function Get-DockerCommandSource
$runParams += '-nologo'
$runParams += '-noprofile'
$runParams += '-c'
$runParams += "(Get-Command -name '$Command' -CommandType '$CommandType').Source"
$runParams += "(Get-Command -name '$Command' -CommandType '$CommandType' -ErrorAction Ignore).Source"

return Invoke-Docker -Command run -Params $runParams -SuppressHostOutput -PassThru
}
Expand Down
1 change: 1 addition & 0 deletions vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ jobs:
vmImage: vs2017-win2016
preview: false
ciParameter: '-CI'
continueonerror: true

# Use the TagFilter to filter to 1809 because the docker instance inside the agent only supports 1809
- template: .vsts-ci/phase.yml
Expand Down