Skip to content

Commit 55ab132

Browse files
authored
Updated ParrotSec (#426)
1 parent 7d20d98 commit 55ab132

File tree

6 files changed

+25
-51
lines changed

6 files changed

+25
-51
lines changed

docs/README.powershellcommunity.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ $ docker pull pshorg/powershellcommunity
3838
* Tags: `oraclelinux-7.5` , `6.1.1-oraclelinux-7.5`
3939
* Dockerfile: [/release/community-stable/oraclelinux/docker/Dockerfile][oracle-linux-stable-dockerfile]
4040
* Example: `docker pull pshorg/powershellcommunity:oraclelinux-7.5`
41-
<!-- Broken
41+
4242
* **[Parrot Linux][parrotsec-linux-uri]**
43-
* Tags: `parrot-4.2.2` , `6.1.1-parrot-4.2.2`
43+
* Tags: `parrotsec-latest` , `7.0.1-parrotsec-latest`
4444
* Dockerfile: [/release/community-stable/parrot/docker/Dockerfile][parrotsec-linux-stable-dockerfile]
45-
* Example: `docker pull pshorg/powershellcommunity:parrot-4.2.2`
46-
-->
45+
* Example: `docker pull pshorg/powershellcommunity:parrotsec-latest`
46+
4747
* **[Photon Linux][parrotsec-linux-uri]**
4848
* Tags: `photon-2.0` , `6.1.1-photon-2.0`
4949
* Dockerfile: [/release/community-stable/photon/docker/Dockerfile][photon-linux-stable-dockerfile]
@@ -55,7 +55,7 @@ $ docker pull pshorg/powershellcommunity
5555
[clear-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/clearlinux/docker/Dockerfile
5656
[kali-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/kali-rolling/docker/Dockerfile
5757
[oracle-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/oraclelinux/docker/Dockerfile
58-
[parrotsec-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/parrot/docker/Dockerfile
58+
[parrotsec-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/parrotsec/docker/Dockerfile
5959
[photon-linux-stable-dockerfile]: https://github.com/PowerShell/PowerShell-Docker/blob/master/release/community-stable/photon/docker/Dockerfile
6060

6161
[amazon-linux-uri]: https://aws.amazon.com/amazon-linux-2/

release/unstable/parrot/docker/Dockerfile renamed to release/community-stable/parrotsec/docker/Dockerfile

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,16 @@
44
# Docker image file that describes an Parrot image with PowerShell
55
# installed from Debian9 PowerShell package
66

7-
# Define arg(s) needed for the From statement
8-
ARG fromTag=latest
9-
ARG imageRepo=parrotsec/parrot-core
10-
11-
FROM ${imageRepo}:${fromTag} AS installer-env
7+
FROM parrotsec/core:latest AS installer-env
128

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

1612
# Define Args for the needed to add the package
17-
ARG PS_VERSION=6.2.3
18-
ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
13+
ARG PS_VERSION=7.0.1
14+
ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.11_amd64.deb
1915
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
20-
ARG PS_INSTALL_VERSION=6
21-
22-
# Define Args for the needed to add the package
23-
ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb
16+
ARG PS_INSTALL_VERSION=7
2417

2518
# Define Args and Env needed to create links
2619
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -52,18 +45,12 @@ RUN \
5245
locales \
5346
# required to support NTLM for PSRemoting
5447
gss-ntlmssp \
55-
# required for dist-upgrade
56-
resolvconf \
48+
wget \
49+
libicu63 \
5750
# enable en_US.UTF-8 locale
5851
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
5952
# generate locale
6053
&& locale-gen && update-locale \
61-
# Download the libicu57 Debian package and save it
62-
&& wget -O /tmp/libicu57_57.1-6+deb9u3_amd64.deb --no-check-certificate ${DEBIAN_PACKAGE_URL} \
63-
# install required libicu57 package
64-
&& dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
65-
# remove libicu57 package
66-
&& rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
6754
# upgrade distro
6855
&& apt-get dist-upgrade -y \
6956
# Download the Debian9 PowerShell Core package and save it
@@ -91,7 +78,7 @@ RUN \
9178
&& rm -rf /var/lib/apt/lists/*
9279

9380
# Define args needed only for the labels
94-
ARG IMAGE_NAME=pshorg/powershellcommunity:parrot-4.4
81+
ARG IMAGE_NAME=pshorg/powershellcommunity:parrotsec-latest
9582
ARG VCS_REF="none"
9683

9784
# Add label last as it's just metadata and uses a lot of parameters
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"IsLinux" : true,
3+
"PackageFormat": "powershell_${PS_VERSION}-1.debian.11_amd64.deb",
4+
"SkipGssNtlmSspTests": false,
5+
"shortTags": [
6+
{"Tag": "latest"}
7+
],
8+
"tagTemplates": [
9+
"#psversion#-parrotsec-#tag#",
10+
"parrotsec"
11+
]
12+
}

release/preview/debian11/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"SubImage": "test-deps",
1212
"TestProperties": {
13-
"size": 314
13+
"size": 330
1414
}
1515
}
1616

release/unstable/parrot/getLatestTag.ps1

Lines changed: 0 additions & 14 deletions
This file was deleted.

release/unstable/parrot/meta.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)