From b0af96cf123070e6cb5dac279b80c4b7243f5689 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:22:58 +0800 Subject: [PATCH 01/10] Add openssh-clients package in amazonlinux --- release/community-stable/amazonlinux/docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile index 32a0e1c2e..8aaeaca79 100644 --- a/release/community-stable/amazonlinux/docker/Dockerfile +++ b/release/community-stable/amazonlinux/docker/Dockerfile @@ -34,6 +34,8 @@ RUN \ && 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 From 34445b1e17a48adea211363587e55d3485053c86 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:24:12 +0800 Subject: [PATCH 02/10] Add openssh-client package in clearlinux --- 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 33a15f944726c019b02b3d307acf14e941aa8083 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:25:06 +0800 Subject: [PATCH 03/10] Add openssh-clients package in photon --- 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 40227d75dfcaabc75bc91820cf289edb6a69aea5 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:48:34 +0800 Subject: [PATCH 04/10] Add openssh package for archlinux --- release/community-stable/archlinux/docker/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release/community-stable/archlinux/docker/Dockerfile b/release/community-stable/archlinux/docker/Dockerfile index 56ce053cc..64de51c7b 100644 --- a/release/community-stable/archlinux/docker/Dockerfile +++ b/release/community-stable/archlinux/docker/Dockerfile @@ -50,6 +50,9 @@ ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 +# Download the PowerShell Core Linux tar.gz and save it +ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.tar.gz + # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ \ @@ -80,12 +83,12 @@ 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 - && 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 \ # remove powershell linux tar file From 387d4e72892c8c513a71f64178384d880bc14d5d Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:48:59 +0800 Subject: [PATCH 05/10] Add openssh package for blackarch --- release/community-stable/blackarch/docker/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release/community-stable/blackarch/docker/Dockerfile b/release/community-stable/blackarch/docker/Dockerfile index 8bf42d49d..be8a0d691 100644 --- a/release/community-stable/blackarch/docker/Dockerfile +++ b/release/community-stable/blackarch/docker/Dockerfile @@ -57,6 +57,9 @@ ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 +# Download the PowerShell Core Linux tar.gz and save it +ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.tar.gz + # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ \ @@ -95,12 +98,12 @@ 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 - && 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} \ # remove powershell linux tar file From 5a3b73480e26dc83dd418b56fd5e8b9ef5d2fcad Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:49:33 +0800 Subject: [PATCH 06/10] Add openssh-client package for kalilinux --- release/community-stable/kalilinux/docker/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/release/community-stable/kalilinux/docker/Dockerfile b/release/community-stable/kalilinux/docker/Dockerfile index ee6bfd250..9ea56b6c2 100644 --- a/release/community-stable/kalilinux/docker/Dockerfile +++ b/release/community-stable/kalilinux/docker/Dockerfile @@ -12,6 +12,9 @@ ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.11_amd64.deb ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 +# Download the PowerShell Core Linux .deb and save it +ADD ${PS_PACKAGE_URL} /tmp/powershell.deb + # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ \ @@ -44,14 +47,14 @@ 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} \ # install powershell package && apt-get install --no-install-recommends -y /tmp/powershell.deb \ # remove powershell package From 9cc7f59087b93e4d8f522e8a780f79c90300a5e1 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:49:55 +0800 Subject: [PATCH 07/10] Add openssh-clients package for oraclelinux --- release/community-stable/oraclelinux/docker/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile index 0fafbf1c5..f79f057ac 100644 --- a/release/community-stable/oraclelinux/docker/Dockerfile +++ b/release/community-stable/oraclelinux/docker/Dockerfile @@ -13,6 +13,9 @@ ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 +# Download the PowerShell Core Linux .deb and save it +ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.rpm + # Define Args and Env needed to create links ENV \ PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ @@ -26,14 +29,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 \ # 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 From 23e6c5331401c9cf5f6ef15296f0cc2f810db463 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Wed, 22 Jul 2020 23:50:17 +0800 Subject: [PATCH 08/10] Add openssh-client package for parrotsec --- .../community-stable/parrotsec/docker/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile index b5d9c2395..27170b4a4 100644 --- a/release/community-stable/parrotsec/docker/Dockerfile +++ b/release/community-stable/parrotsec/docker/Dockerfile @@ -15,6 +15,9 @@ ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.11_amd64.deb ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 +# Download the PowerShell Core Linux tar.gz and save it +ADD ${PS_PACKAGE_URL} /tmp/powershell.deb + # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ \ @@ -45,16 +48,14 @@ 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 \ - # upgrade distro - && parrot-upgrade \ - # Download the Debian9 PowerShell Core package and save it - && wget -O /tmp/powershell.deb --no-check-certificate ${PS_PACKAGE_URL} \ # install powershell package && apt install --no-install-recommends -y /tmp/powershell.deb \ # remove powershell package @@ -72,6 +73,8 @@ RUN \ Write-Host "'Waiting for $env:PSModuleAnalysisCachePath'" ; \ Start-Sleep -Seconds 6 ; \ }" \ + # upgrade distro + && parrot-upgrade \ # clean downloaded packages && apt autoremove \ # remove package list From 8d6edabec93bb761e05741876f4f281a9b96342c Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 00:04:46 +0800 Subject: [PATCH 09/10] fix commenting typo --- release/community-stable/oraclelinux/docker/Dockerfile | 2 +- release/community-stable/parrotsec/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile index f79f057ac..1c9ff4bca 100644 --- a/release/community-stable/oraclelinux/docker/Dockerfile +++ b/release/community-stable/oraclelinux/docker/Dockerfile @@ -13,7 +13,7 @@ ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 -# Download the PowerShell Core Linux .deb and save it +# Download the PowerShell Core Linux .rpm and save it ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.rpm # Define Args and Env needed to create links diff --git a/release/community-stable/parrotsec/docker/Dockerfile b/release/community-stable/parrotsec/docker/Dockerfile index 27170b4a4..970554a42 100644 --- a/release/community-stable/parrotsec/docker/Dockerfile +++ b/release/community-stable/parrotsec/docker/Dockerfile @@ -15,7 +15,7 @@ ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.11_amd64.deb ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 -# Download the PowerShell Core Linux tar.gz and save it +# Download the PowerShell Core Linux .deb and save it ADD ${PS_PACKAGE_URL} /tmp/powershell.deb # Define Args and Env needed to create links From 438598e17ab8d389d68feb1cfccf585aac62cd51 Mon Sep 17 00:00:00 2001 From: Ryen Tang Date: Thu, 23 Jul 2020 00:06:00 +0800 Subject: [PATCH 10/10] Use docker ADD instead of curl or wget --- release/community-stable/amazonlinux/docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile index 8aaeaca79..b6b2b2770 100644 --- a/release/community-stable/amazonlinux/docker/Dockerfile +++ b/release/community-stable/amazonlinux/docker/Dockerfile @@ -13,6 +13,9 @@ ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} ARG PS_INSTALL_VERSION=7 +# Download the PowerShell Core Linux .rpm and save it +ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.rpm + # Define Args and Env needed to create links ENV \ PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ @@ -26,8 +29,6 @@ ENV \ # Installation RUN \ - # download PowerShell rpm package - curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \ # update package list && yum update -y \ # install dependencies