Resolve KASM-5447 "Feature/ parrotos 6"

This commit is contained in:
Ryan Kuba 2024-01-22 15:21:10 +00:00 committed by Justin Travis
parent 25b2f27dcb
commit 3bd5d03a30
9 changed files with 12 additions and 10 deletions

View File

@ -475,12 +475,12 @@ multiImages:
- src/ubuntu/install/cleanup/**
- src/ubuntu/install/chromium/**
- src/ubuntu/install/slack/**
- name: parrotos-5-desktop
- name: parrotos-6-desktop
singleapp: false
base: core-parrotos-5
dockerfile: dockerfile-kasm-parrotos-5-desktop
base: core-parrotos-6
dockerfile: dockerfile-kasm-parrotos-6-desktop
changeFiles:
- dockerfile-kasm-parrotos-5-desktop
- dockerfile-kasm-parrotos-6-desktop
- src/ubuntu/install/parrot/**
- src/ubuntu/install/firefox/**
- src/ubuntu/install/cleanup/**

View File

@ -1,5 +1,5 @@
ARG BASE_TAG="develop"
ARG BASE_IMAGE="core-parrotos-5"
ARG BASE_IMAGE="core-parrotos-6"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
@ -15,6 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
INST_DIR=$STARTUPDIR/install \
INST_SCRIPTS="/ubuntu/install/parrot/install_parrot.sh \
/ubuntu/install/chromium/install_chromium.sh \
/ubuntu/install/vs_code/install_vs_code.sh \
/ubuntu/install/firefox/install_firefox.sh \
/ubuntu/install/cleanup/cleanup.sh"

View File

@ -1 +0,0 @@
Parrot OS 5 desktop for Kasm Workspaces

View File

@ -1,6 +1,6 @@
# About This Image
This Image contains a browser-accessible Parrot OS 5 Desktop with various productivity and development apps installed.
This Image contains a browser-accessible Parrot OS 6 Desktop with various productivity and development apps installed.
![Screenshot][Image_Screenshot]

View File

@ -0,0 +1 @@
Parrot OS 6 desktop for Kasm Workspaces

View File

@ -8,7 +8,7 @@ elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|oracle
dnf clean all
elif [ "${DISTRO}" == "opensuse" ]; then
zypper clean --all
elif [[ "${DISTRO}" == @(debian|kali|parrotos5|ubuntu) ]]; then
elif [[ "${DISTRO}" == @(debian|kali|parrotos6|ubuntu) ]]; then
apt-get autoremove -y
apt-get autoclean -y
fi

View File

@ -21,7 +21,8 @@ apt-get install -y \
parrot-tools-forensics \
parrot-tools-reversing \
parrot-tools-cloud \
powershell-empire-
powershell-empire- \
codium-
# Disable power manager
rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop

View File

@ -2,7 +2,7 @@
set -ex
# Install OpenVPN/Wireguard deps
if [[ "${DISTRO}" == @(ubuntu|kali|debian|parrotos5) ]]; then
if [[ "${DISTRO}" == @(ubuntu|kali|debian|parrotos6) ]]; then
echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections
apt-get update
apt-get install -y --no-install-recommends \