Skip to content

Commit 2c9ea90

Browse files
kiazhiTravisEz13
authored andcommitted
Fix ParrotSec failing (#290)
* Fix issue 289 * update yml to set continuronerror to false * Update tag from 4.4 to latest
1 parent 57246a6 commit 2c9ea90

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

release/community-stable/parrot/docker/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# installed from Debian9 PowerShell package
66

77
# Define arg(s) needed for the From statement
8-
ARG fromTag=4.4
8+
ARG fromTag=latest
99
ARG imageRepo=parrotsec/parrot-core
1010

1111
FROM ${imageRepo}:${fromTag} AS installer-env
@@ -14,7 +14,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
1414
ENTRYPOINT [ ]
1515

1616
# Define Args for the needed to add the package
17-
ARG PS_VERSION=6.1.0
17+
ARG PS_VERSION=6.2.3
1818
ARG PS_PACKAGE=powershell_${PS_VERSION}-1.debian.9_amd64.deb
1919
ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
2020
ARG PS_INSTALL_VERSION=6
@@ -23,10 +23,10 @@ ARG PS_INSTALL_VERSION=6
2323
ADD ${PS_PACKAGE_URL} /tmp/powershell.deb
2424

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

2828
# Download the libicu57 Debian package and save it
29-
ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u2_amd64.deb
29+
ADD ${DEBIAN_PACKAGE_URL} /tmp/libicu57_57.1-6+deb9u3_amd64.deb
3030

3131
# Define Args and Env needed to create links
3232
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
@@ -63,9 +63,9 @@ RUN \
6363
# generate locale
6464
&& locale-gen && update-locale \
6565
# install required libicu57 package
66-
&& dpkg -i /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
66+
&& dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
6767
# remove libicu57 package
68-
&& rm -f /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
68+
&& rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
6969
# install powershell package
7070
&& apt-get install -y /tmp/powershell.deb \
7171
# remove powershell package

release/community-stable/parrot/getLatestTag.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# return objects representing the tags we need to base the parrot image on
55

66
# The versions of parrot we care about
7-
$shortTags = @('4.4')
7+
$shortTags = @('latest')
88

99
$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
1010
$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'

vsts-ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
stable: false
136136
preview: false
137137
communityStable: true
138-
continueonerror: true
138+
continueonerror: false
139139

140140
- template: .vsts-ci/phase.yml
141141
parameters:
@@ -144,6 +144,7 @@ jobs:
144144
stable: false
145145
preview: false
146146
communityStable: true
147+
continueonerror: false
147148

148149
- template: .vsts-ci/phase.yml
149150
parameters:
@@ -152,6 +153,7 @@ jobs:
152153
stable: false
153154
preview: false
154155
communityStable: true
156+
continueonerror: false
155157

156158
- template: .vsts-ci/phase.yml
157159
parameters:
@@ -169,6 +171,7 @@ jobs:
169171
stable: false
170172
preview: false
171173
communityStable: true
174+
continueonerror: false
172175

173176

174177
# The -CI filters to LTSC-2016 for nanoserver by default, which is the only thing that works on Hosted VS2017

0 commit comments

Comments
 (0)