Skip to content

Commit

Permalink
Updated ParrotSec (#426)
Browse files Browse the repository at this point in the history
  • Loading branch information
kiazhi authored May 20, 2020
1 parent 7d20d98 commit 55ab132
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 51 deletions.
10 changes: 5 additions & 5 deletions docs/README.powershellcommunity.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ $ docker pull pshorg/powershellcommunity
* Tags: `oraclelinux-7.5` , `6.1.1-oraclelinux-7.5`
* Dockerfile: [/release/community-stable/oraclelinux/docker/Dockerfile][oracle-linux-stable-dockerfile]
* Example: `docker pull pshorg/powershellcommunity:oraclelinux-7.5`
<!-- Broken

* **[Parrot Linux][parrotsec-linux-uri]**
* Tags: `parrot-4.2.2` , `6.1.1-parrot-4.2.2`
* Tags: `parrotsec-latest` , `7.0.1-parrotsec-latest`
* Dockerfile: [/release/community-stable/parrot/docker/Dockerfile][parrotsec-linux-stable-dockerfile]
* Example: `docker pull pshorg/powershellcommunity:parrot-4.2.2`
-->
* Example: `docker pull pshorg/powershellcommunity:parrotsec-latest`

* **[Photon Linux][parrotsec-linux-uri]**
* Tags: `photon-2.0` , `6.1.1-photon-2.0`
* Dockerfile: [/release/community-stable/photon/docker/Dockerfile][photon-linux-stable-dockerfile]
Expand All @@ -55,7 +55,7 @@ $ docker pull pshorg/powershellcommunity
[clear-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/clearlinux/docker/Dockerfile
[kali-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/kali-rolling/docker/Dockerfile
[oracle-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/oraclelinux/docker/Dockerfile
[parrotsec-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/parrot/docker/Dockerfile
[parrotsec-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/parrotsec/docker/Dockerfile
[photon-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/photon/docker/Dockerfile

[amazon-linux-uri]: https://aws.amazon.com/amazon-linux-2/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,16 @@
# Docker image file that describes an Parrot image with PowerShell
# installed from Debian9 PowerShell package

# Define arg(s) needed for the From statement
ARG fromTag=latest
ARG imageRepo=parrotsec/parrot-core

FROM ${imageRepo}:${fromTag} AS installer-env
FROM parrotsec/core:latest AS installer-env

# Clear the entrypoint in parrotsec/parrot-core image
ENTRYPOINT [ ]

# Define Args for the needed to add the package
ARG PS_VERSION=6.2.3
ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
ARG PS_VERSION=7.0.1
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=6

# Define Args for the needed to add the package
ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
ARG PS_INSTALL_VERSION=7

# Define Args and Env needed to create links
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
Expand Down Expand Up @@ -52,18 +45,12 @@ RUN \
locales \
# required to support NTLM for PSRemoting
gss-ntlmssp \
# required for dist-upgrade
resolvconf \
wget \
libicu63 \
# enable en_US.UTF-8 locale
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
# generate locale
&& locale-gen && update-locale \
# Download the libicu57 Debian package and save it
&& wget -O /tmp/libicu57_57.1-6+deb9u3_amd64.deb --no-check-certificate ${DEBIAN_PACKAGE_URL} \
# install required libicu57 package
&& dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
# remove libicu57 package
&& rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
# upgrade distro
&& apt-get dist-upgrade -y \
# Download the Debian9 PowerShell Core package and save it
Expand Down Expand Up @@ -91,7 +78,7 @@ RUN \
&& rm -rf /var/lib/apt/lists/*

# Define args needed only for the labels
ARG IMAGE_NAME=pshorg/powershellcommunity:parrot-4.4
ARG IMAGE_NAME=pshorg/powershellcommunity:parrotsec-latest
ARG VCS_REF="none"

# Add label last as it's just metadata and uses a lot of parameters
Expand Down
12 changes: 12 additions & 0 deletions release/community-stable/parrotsec/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"IsLinux" : true,
"PackageFormat": "powershell_${PS_VERSION}-1.debian.11_amd64.deb",
"SkipGssNtlmSspTests": false,
"shortTags": [
{"Tag": "latest"}
],
"tagTemplates": [
"#psversion#-parrotsec-#tag#",
"parrotsec"
]
}
2 changes: 1 addition & 1 deletion release/preview/debian11/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"SubImage": "test-deps",
"TestProperties": {
"size": 314
"size": 330
}
}

14 changes: 0 additions & 14 deletions release/unstable/parrot/getLatestTag.ps1

This file was deleted.

11 changes: 0 additions & 11 deletions release/unstable/parrot/meta.json

This file was deleted.

0 comments on commit 55ab132

Please sign in to comment.