From 333473a9fa1c728d85b97cdc20dae3f818bc5931 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Sat, 25 Jul 2020 00:43:41 +0800 Subject: [PATCH 1/6] Add openssh-client package to Alpine preview --- release/preview/alpine311/docker/Dockerfile | 3 +++ release/preview/alpine39/docker/Dockerfile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/release/preview/alpine311/docker/Dockerfile b/release/preview/alpine311/docker/Dockerfile index 5d7045386..366aa81a7 100644 --- a/release/preview/alpine311/docker/Dockerfile +++ b/release/preview/alpine311/docker/Dockerfile @@ -62,6 +62,9 @@ RUN apk add --no-cache \ && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \ lttng-ust \ \ + # PowerShell remoting over SSH dependencies + openssh-client \ + \ # Create the pwsh symbolic link that points to powershell && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \ \ diff --git a/release/preview/alpine39/docker/Dockerfile b/release/preview/alpine39/docker/Dockerfile index 827bfc462..2a6077e49 100644 --- a/release/preview/alpine39/docker/Dockerfile +++ b/release/preview/alpine39/docker/Dockerfile @@ -68,6 +68,9 @@ RUN apk add --no-cache \ && apk -X https://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \ lttng-ust \ \ + # PowerShell remoting over SSH dependencies + openssh-client \ + \ # Create the pwsh symbolic link that points to powershell && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \ \ From c63ad184af67d480bcdbe4a16cb94b8f183b8760 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Sat, 25 Jul 2020 00:44:15 +0800 Subject: [PATCH 2/6] Add openssh-clients package to Centos preview --- release/preview/centos7/docker/Dockerfile | 2 ++ release/preview/centos8/docker/Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile index b6004302e..e9d5e1ee9 100644 --- a/release/preview/centos7/docker/Dockerfile +++ b/release/preview/centos7/docker/Dockerfile @@ -32,6 +32,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ gssntlmssp \ # less is required for help in powershell less \ + # PowerShell remoting over SSH dependencies + openssh-clients \ && yum upgrade-minimal -y --security \ && yum clean all \ && localedef --charmap=UTF-8 --inputfile=en_US $LANG \ diff --git a/release/preview/centos8/docker/Dockerfile b/release/preview/centos8/docker/Dockerfile index fbb4b358d..26008d7ee 100644 --- a/release/preview/centos8/docker/Dockerfile +++ b/release/preview/centos8/docker/Dockerfile @@ -34,6 +34,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ less \ # clear is part of ncurses which is used by clear ncurses \ + # PowerShell remoting over SSH dependencies + openssh-clients \ && yum upgrade-minimal -y --security \ && yum clean all \ # remove powershell package From 4bfc40582ef21c29267aacec233e1c1c6d253d3a Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Sat, 25 Jul 2020 00:44:48 +0800 Subject: [PATCH 3/6] Add openssh-client package to Debian preview --- release/preview/debian10/docker/Dockerfile | 2 ++ release/preview/debian11/docker/Dockerfile | 2 ++ release/preview/debian9/docker/Dockerfile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/release/preview/debian10/docker/Dockerfile b/release/preview/debian10/docker/Dockerfile index 20f860b50..b01d0c47c 100644 --- a/release/preview/debian10/docker/Dockerfile +++ b/release/preview/debian10/docker/Dockerfile @@ -61,6 +61,8 @@ RUN apt-get update \ liblttng-ust0 \ libstdc++6 \ zlib1g \ + # PowerShell remoting over SSH dependencies + openssh-client \ && apt-get dist-upgrade -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ diff --git a/release/preview/debian11/docker/Dockerfile b/release/preview/debian11/docker/Dockerfile index 631f26e8b..348b6faa6 100644 --- a/release/preview/debian11/docker/Dockerfile +++ b/release/preview/debian11/docker/Dockerfile @@ -61,6 +61,8 @@ RUN apt-get update \ liblttng-ust0 \ libstdc++6 \ zlib1g \ + # PowerShell remoting over SSH dependencies + openssh-client \ && apt-get dist-upgrade -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile index a5c3553ac..67f627498 100644 --- a/release/preview/debian9/docker/Dockerfile +++ b/release/preview/debian9/docker/Dockerfile @@ -28,6 +28,8 @@ RUN apt-get update \ # required for SSL ca-certificates \ gss-ntlmssp \ + # PowerShell remoting over SSH dependencies + openssh-client \ # Download the Linux package and save it && echo ${PS_PACKAGE_URL} \ && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \ From ff024d28fc950794491c0bba5cb58973be946faa Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Sat, 25 Jul 2020 00:45:04 +0800 Subject: [PATCH 4/6] Add openssh-clients package to Fedora preview --- release/preview/fedora/docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile index 5915ac4eb..573bd1e47 100644 --- a/release/preview/fedora/docker/Dockerfile +++ b/release/preview/fedora/docker/Dockerfile @@ -31,6 +31,8 @@ RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ compat-openssl10 \ ca-certificates \ gssntlmssp \ + # PowerShell remoting over SSH dependencies + openssh-clients \ && echo "end - misc packages" \ && ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh \ && echo "starting FEDORA-2019-27e7b92407" \ From 94aa86469b054c3169460617bb4e05f66098b11e Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Sat, 25 Jul 2020 00:45:27 +0800 Subject: [PATCH 5/6] Add openssh-client package to Ubuntu preview --- release/preview/ubuntu16.04/docker/Dockerfile | 2 ++ release/preview/ubuntu18.04/docker/Dockerfile | 2 ++ release/preview/ubuntu20.04/docker/Dockerfile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/release/preview/ubuntu16.04/docker/Dockerfile b/release/preview/ubuntu16.04/docker/Dockerfile index 727a54d57..e45b881d2 100644 --- a/release/preview/ubuntu16.04/docker/Dockerfile +++ b/release/preview/ubuntu16.04/docker/Dockerfile @@ -28,6 +28,8 @@ RUN apt-get update \ # required for SSL ca-certificates \ gss-ntlmssp \ + # PowerShell remoting over SSH dependencies + openssh-client \ # Download the Linux package and save it && echo ${PS_PACKAGE_URL} \ && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \ diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile index 9f3db9364..509f832d4 100644 --- a/release/preview/ubuntu18.04/docker/Dockerfile +++ b/release/preview/ubuntu18.04/docker/Dockerfile @@ -28,6 +28,8 @@ RUN apt-get update \ # required for SSL ca-certificates \ gss-ntlmssp \ + # PowerShell remoting over SSH dependencies + openssh-client \ # Download the Linux package and save it && echo ${PS_PACKAGE_URL} \ && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \ diff --git a/release/preview/ubuntu20.04/docker/Dockerfile b/release/preview/ubuntu20.04/docker/Dockerfile index f139fa96b..3af27e43b 100644 --- a/release/preview/ubuntu20.04/docker/Dockerfile +++ b/release/preview/ubuntu20.04/docker/Dockerfile @@ -60,6 +60,8 @@ RUN apt-get update \ liblttng-ust0 \ libstdc++6 \ zlib1g \ + # PowerShell remoting over SSH dependencies + openssh-client \ # Download the Linux package and save it && apt-get dist-upgrade -y \ && apt-get clean \ From ba2a0f423665ba44ce42480f45db175f77e07712 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Sat, 25 Jul 2020 01:43:23 +0800 Subject: [PATCH 6/6] Increment Alpine 3.11 (Preview) size --- release/preview/alpine311/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/alpine311/meta.json b/release/preview/alpine311/meta.json index 8d5d95ab7..998fb3b9e 100644 --- a/release/preview/alpine311/meta.json +++ b/release/preview/alpine311/meta.json @@ -13,6 +13,6 @@ "SkipGssNtlmSspTests": true, "SubImage": "test-deps", "TestProperties": { - "size": 210 + "size": 211 } }