From 89c36572b0253b72d94f072dc06c0475be2cb838 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:34:02 +0800 Subject: [PATCH 01/10] Add openssh-clients package to amazonlinux image --- release/community-stable/amazonlinux/docker/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile index 32a0e1c2e..13f5cffe6 100644 --- a/release/community-stable/amazonlinux/docker/Dockerfile +++ b/release/community-stable/amazonlinux/docker/Dockerfile @@ -26,14 +26,14 @@ ENV \ # Installation RUN \ - # download PowerShell rpm package - curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \ # update package list - && yum update -y \ + yum update -y \ # install dependencies && yum install -y \ # required for help in PowerShell less \ + # required for SSH + openssh-clients \ # install EPEL repository https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ # update package list from EPEL repository @@ -42,6 +42,8 @@ RUN \ && yum install -y \ # install gssntlmssp package gssntlmssp \ + # download the powershell package + && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \ # install powershell package && yum install -y /tmp/powershell-linux.rpm \ # remove powershell package From d7c2c5d5ce7f88d01c6493fc961322c1b4aff96a Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:34:43 +0800 Subject: [PATCH 02/10] Add openssh package to archlinux image --- release/community-stable/archlinux/docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile index 56ce053cc..9cf9c2e1f 100644 --- a/release/community-stable/archlinux/docker/Dockerfile +++ b/release/community-stable/archlinux/docker/Dockerfile @@ -80,11 +80,13 @@ RUN \ core/icu \ # required for SSL openssl-1.0 \ + # required for SSH + openssh \ # install gss-ntlmssp package from the previous stage && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \ # create powershell folder && mkdir -p ${PS_INSTALL_FOLDER} \ - # Pull down the powershell linux tar file + # download the powershell linux compressed package && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \ # uncompress powershell linux tar file && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} -v \ From 77bf0e7f457b3814a18a8866221b6b10c0296114 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:34:53 +0800 Subject: [PATCH 03/10] Add openssh package to blackarch image --- release/community-stable/blackarch/docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile index 8bf42d49d..e4d26ff23 100644 --- a/release/community-stable/blackarch/docker/Dockerfile +++ b/release/community-stable/blackarch/docker/Dockerfile @@ -95,11 +95,13 @@ RUN \ core/icu \ # required for SSL openssl-1.0 \ + # required for SSH + openssh \ # install gss-ntlmssp package from the previous stage && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \ # create powershell folder && mkdir -p ${PS_INSTALL_FOLDER} \ - # Pull down the powershell linux tar file + # download the powershell linux compressed package && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.tar.gz \ # uncompress powershell linux tar file && tar zxf /tmp/powershell-linux.tar.gz -C ${PS_INSTALL_FOLDER} \ From 3bdb964aa0fb62aa4e80692711b9988977b126a3 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:35:15 +0800 Subject: [PATCH 04/10] Add openssh-client package to clearlinux image --- release/community-stable/clearlinux/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/community-stable/clearlinux/docker/Dockerfile b/release/community-stable/clearlinux/docker/Dockerfile index aeeaba615..9c11daf7a 100644 --- a/release/community-stable/clearlinux/docker/Dockerfile +++ b/release/community-stable/clearlinux/docker/Dockerfile @@ -32,7 +32,10 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ RUN \ # install dependencies swupd bundle-add \ + # required for help in PowerShell less \ + # required for SSH + openssh-client \ # create powershell folder && mkdir -p ${PS_INSTALL_FOLDER} \ # uncompress powershell linux tar file From 36d1d4cdc3b2ce5c37714e3261fc4af6b55403f9 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:35:41 +0800 Subject: [PATCH 05/10] Add openssh-client package to kalilinux image --- release/community-stable/kalilinux/docker/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile index ee6bfd250..c2ec22a26 100644 --- a/release/community-stable/kalilinux/docker/Dockerfile +++ b/release/community-stable/kalilinux/docker/Dockerfile @@ -35,7 +35,7 @@ RUN \ # install dependencies && apt-get install --no-install-recommends -y \ # required for HttpClientHandler - libcurl4 \ + curl \ # required for SSL ca-certificates \ # required for help in powershell @@ -44,14 +44,16 @@ RUN \ locales \ # required to support NTLM for PSRemoting gss-ntlmssp \ - wget \ + # required for International Components for Unicode libicu63 \ + # required for SSH + openssh-client \ # enable en_US.UTF-8 locale && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ # generate locale && locale-gen && update-locale \ # download the powershell package - && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \ + && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \ # install powershell package && apt-get install --no-install-recommends -y /tmp/powershell.deb \ # remove powershell package From 880364d25109c7c7e785080e469480d311b09503 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:36:02 +0800 Subject: [PATCH 06/10] Add openssh-client package to parrotsec image --- release/community-stable/parrotsec/docker/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile index b5d9c2395..d067e1453 100644 --- a/release/community-stable/parrotsec/docker/Dockerfile +++ b/release/community-stable/parrotsec/docker/Dockerfile @@ -38,23 +38,25 @@ RUN \ # install dependencies && apt install --no-install-recommends -y \ # required for HttpClientHandler - libcurl4 \ + curl \ # required for help in powershell less \ # required to setup the locale locales \ # required to support NTLM for PSRemoting gss-ntlmssp \ - wget \ + # required for International Components for Unicode libicu63 \ + # required for SSH + openssh-client \ # enable en_US.UTF-8 locale && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ # generate locale && locale-gen && update-locale \ # upgrade distro && parrot-upgrade \ - # Download the Debian9 PowerShell Core package and save it - && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \ + # download the powershell package + && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.deb \ # install powershell package && apt install --no-install-recommends -y /tmp/powershell.deb \ # remove powershell package From 236b4b5495f3118796f4b23fad7933926e70a01e Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:36:18 +0800 Subject: [PATCH 07/10] Add openssh-clients package to photon image --- release/community-stable/photon/docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/community-stable/photon/docker/Dockerfile b/release/community-stable/photon/docker/Dockerfile index e65ec3b8a..2241f33bc 100644 --- a/release/community-stable/photon/docker/Dockerfile +++ b/release/community-stable/photon/docker/Dockerfile @@ -72,6 +72,8 @@ RUN \ less \ # required for xterm library ncurses-terminfo-6.1-2.ph3.x86_64 \ + # required for SSH + openssh-clients \ # generate locale && locale-gen.sh \ # create the pwsh symbolic link that points to powershell From b90fee6af41d6ababc80530c3e00d5145cb04175 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 22:36:53 +0800 Subject: [PATCH 08/10] Add openssh-clients package to oraclelinux image --- release/unstable/oraclelinux/docker/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/unstable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile index 0fafbf1c5..ed9cd84cd 100644 --- a/release/unstable/oraclelinux/docker/Dockerfile +++ b/release/unstable/oraclelinux/docker/Dockerfile @@ -26,14 +26,14 @@ ENV \ # Installation RUN \ - # download PowerShell rpm package - curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \ # update package list - && yum update \ + yum update -y \ # install dependencies && yum install -y \ # required for help in powershell less \ + # required for SSH + openssh-clients \ # install EPEL repository oracle-epel-release-el7 \ # update package list from EPEL repository @@ -42,6 +42,8 @@ RUN \ && yum install -y \ # install gssntlmssp package gssntlmssp \ + # download the powershell package + && curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \ # install powershell package && yum install -y /tmp/powershell-linux.rpm \ # remove powershell package From 85d28131d65e5c518c43c42cc07d34591fa5f041 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 23:38:13 +0800 Subject: [PATCH 09/10] fix file extension *.xz to new *.zst in archlinux --- release/community-stable/archlinux/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile index 9cf9c2e1f..2abf966f3 100644 --- a/release/community-stable/archlinux/docker/Dockerfile +++ b/release/community-stable/archlinux/docker/Dockerfile @@ -42,7 +42,7 @@ RUN \ FROM archlinux:latest # Copy only the files we need from the previous stage -COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"] +COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst"] # Define Args for the needed to add the package ARG PS_VERSION=7.0.1 @@ -83,7 +83,7 @@ RUN \ # required for SSH openssh \ # install gss-ntlmssp package from the previous stage - && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \ + && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst \ # create powershell folder && mkdir -p ${PS_INSTALL_FOLDER} \ # download the powershell linux compressed package From 4d458d1d7accbb3c863a657e59a02f1d810d6468 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 23:38:31 +0800 Subject: [PATCH 10/10] fix file extension *.xz to new *.zst in blackarch --- release/community-stable/blackarch/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile index e4d26ff23..1887cb64b 100644 --- a/release/community-stable/blackarch/docker/Dockerfile +++ b/release/community-stable/blackarch/docker/Dockerfile @@ -43,7 +43,7 @@ RUN \ FROM archlinux:latest # Copy only the files we need from the previous stage -COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz"] +COPY --from=installer-env ["/tmp/gss-ntlmssp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst", "/tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst"] # Define Args for the needed for BlackArch Linux ARG BlackArch_Strap_URL=https://blackarch.org/strap.sh @@ -98,7 +98,7 @@ RUN \ # required for SSH openssh \ # install gss-ntlmssp package from the previous stage - && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.xz \ + && pacman -U --noconfirm /tmp/gss-ntlmssp-0.8.0.r3.g2251a72-1-x86_64.pkg.tar.zst \ # create powershell folder && mkdir -p ${PS_INSTALL_FOLDER} \ # download the powershell linux compressed package