Skip to content

Fix ParrotSec failing #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 17, 2019
Merged

Fix ParrotSec failing #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f61894
Fix issue 289
kiazhi Oct 16, 2019
687e170
update yml to set continuronerror to false
kiazhi Oct 16, 2019
d6a89f0
Update tag from 4.4 to latest
kiazhi Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions release/community-stable/parrot/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# installed from Debian9 PowerShell package

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

FROM ${imageRepo}:${fromTag} AS installer-env
Expand All @@ -14,7 +14,7 @@ FROM ${imageRepo}:${fromTag} AS installer-env
ENTRYPOINT [ ]

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

# 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+deb9u2_amd64.deb
ARG DEBIAN_PACKAGE_URL=http://ftp.us.debian.org/debian/pool/main/i/icu/libicu57_57.1-6+deb9u3_amd64.deb

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

# Define Args and Env needed to create links
ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
Expand Down Expand Up @@ -63,9 +63,9 @@ RUN \
# generate locale
&& locale-gen && update-locale \
# install required libicu57 package
&& dpkg -i /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
&& dpkg -i /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
# remove libicu57 package
&& rm -f /tmp/libicu57_57.1-6+deb9u2_amd64.deb \
&& rm -f /tmp/libicu57_57.1-6+deb9u3_amd64.deb \
# install powershell package
&& apt-get install -y /tmp/powershell.deb \
# remove powershell package
Expand Down
2 changes: 1 addition & 1 deletion release/community-stable/parrot/getLatestTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# return objects representing the tags we need to base the parrot image on

# The versions of parrot we care about
$shortTags = @('4.4')
$shortTags = @('latest')

$parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
$repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
Expand Down
5 changes: 4 additions & 1 deletion vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
stable: false
preview: false
communityStable: true
continueonerror: true
continueonerror: false

- template: .vsts-ci/phase.yml
parameters:
Expand All @@ -144,6 +144,7 @@ jobs:
stable: false
preview: false
communityStable: true
continueonerror: false

- template: .vsts-ci/phase.yml
parameters:
Expand All @@ -152,6 +153,7 @@ jobs:
stable: false
preview: false
communityStable: true
continueonerror: false

- template: .vsts-ci/phase.yml
parameters:
Expand All @@ -169,6 +171,7 @@ jobs:
stable: false
preview: false
communityStable: true
continueonerror: false


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