Resolve KASM-5907 "Feature/ kasm 5854 fedora40 noble"

This commit is contained in:
Ryan Kuba 2024-05-01 19:17:17 +00:00 committed by Matthew McClaskey
parent e13da99233
commit 672289e45a
29 changed files with 230 additions and 42 deletions

View File

@ -290,6 +290,33 @@ multiImages:
- src/ubuntu/install/ansible/** - src/ubuntu/install/ansible/**
- src/ubuntu/install/chrome/** - src/ubuntu/install/chrome/**
- src/ubuntu/install/slack/** - src/ubuntu/install/slack/**
- name: ubuntu-noble-desktop
singleapp: false
base: core-ubuntu-noble
dockerfile: dockerfile-kasm-ubuntu-noble-desktop
changeFiles:
- dockerfile-kasm-ubuntu-noble-desktop
- src/ubuntu/install/zoom/**
- src/ubuntu/install/vs_code/**
- src/ubuntu/install/tools/**
- src/ubuntu/install/thunderbird/**
- src/ubuntu/install/terraform/**
- src/ubuntu/install/telegram/**
- src/ubuntu/install/sublime_text/**
- src/ubuntu/install/signal/**
- src/ubuntu/install/remmina/**
- src/ubuntu/install/only_office/**
- src/ubuntu/install/obs/**
- src/ubuntu/install/nextcloud/**
- src/ubuntu/install/misc/**
- src/ubuntu/install/gimp/**
- src/ubuntu/install/gamepad_utils/**
- src/ubuntu/install/firefox/**
- src/ubuntu/install/cleanup/**
- src/ubuntu/install/chromium/**
- src/ubuntu/install/ansible/**
- src/ubuntu/install/chrome/**
- src/ubuntu/install/slack/**
- name: vlc - name: vlc
singleapp: true singleapp: true
base: core-ubuntu-focal base: core-ubuntu-focal
@ -455,6 +482,19 @@ multiImages:
- src/ubuntu/install/cleanup/** - src/ubuntu/install/cleanup/**
- src/ubuntu/install/chromium/** - src/ubuntu/install/chromium/**
- src/ubuntu/install/slack/** - src/ubuntu/install/slack/**
- name: fedora-40-desktop
singleapp: false
base: core-fedora-40
dockerfile: dockerfile-kasm-fedora-40-desktop
changeFiles:
- dockerfile-kasm-fedora-40-desktop
- src/oracle/install/**
- src/ubuntu/install/thunderbird/**
- src/ubuntu/install/remmina/**
- src/ubuntu/install/firefox/**
- src/ubuntu/install/cleanup/**
- src/ubuntu/install/chromium/**
- src/ubuntu/install/slack/**
- name: kali-rolling-desktop - name: kali-rolling-desktop
singleapp: false singleapp: false
base: core-kali-rolling base: core-kali-rolling

View File

@ -0,0 +1,53 @@
ARG BASE_TAG="develop"
ARG BASE_IMAGE="core-fedora-40"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
ENV DISTRO=fedora40
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
WORKDIR $HOME
### Envrionment config
ENV SKIP_CLEAN=true \
KASM_RX_HOME=$STARTUPDIR/kasmrx \
DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \
INST_DIR=$STARTUPDIR/install \
INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \
/oracle/install/misc/install_tools.sh \
/ubuntu/install/chromium/install_chromium.sh \
/ubuntu/install/firefox/install_firefox.sh \
/oracle/install/sublime_text/install_sublime_text.sh \
/oracle/install/vs_code/install_vs_code.sh \
/ubuntu/install/remmina/install_remmina.sh \
/oracle/install/only_office/install_only_office.sh \
/oracle/install/gimp/install_gimp.sh \
/oracle/install/zoom/install_zoom.sh \
/oracle/install/ansible/install_ansible.sh \
/oracle/install/telegram/install_telegram.sh \
/ubuntu/install/thunderbird/install_thunderbird.sh \
/ubuntu/install/slack/install_slack.sh \
/ubuntu/install/cleanup/cleanup.sh"
# Copy install scripts
COPY ./src/ $INST_DIR
# Run installations
RUN \
for SCRIPT in $INST_SCRIPTS; do \
bash ${INST_DIR}${SCRIPT} || exit 1; \
done && \
$STARTUPDIR/set_user_permission.sh $HOME && \
rm -f /etc/X11/xinit/Xclients && \
chown 1000:0 $HOME && \
mkdir -p /home/kasm-user && \
chown -R 1000:0 /home/kasm-user && \
rm -Rf ${INST_DIR}
# Userspace Runtime
ENV HOME /home/kasm-user
WORKDIR $HOME
USER 1000
CMD ["--tail-log"]

View File

@ -0,0 +1,57 @@
ARG BASE_TAG="develop"
ARG BASE_IMAGE="core-ubuntu-noble"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
WORKDIR $HOME
### Envrionment config
ENV DEBIAN_FRONTEND=noninteractive \
SKIP_CLEAN=true \
KASM_RX_HOME=$STARTUPDIR/kasmrx \
DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \
INST_DIR=$STARTUPDIR/install \
INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \
/ubuntu/install/misc/install_tools.sh \
/ubuntu/install/chrome/install_chrome.sh \
/ubuntu/install/chromium/install_chromium.sh \
/ubuntu/install/firefox/install_firefox.sh \
/ubuntu/install/sublime_text/install_sublime_text.sh \
/ubuntu/install/vs_code/install_vs_code.sh \
/ubuntu/install/nextcloud/install_nextcloud.sh \
/ubuntu/install/remmina/install_remmina.sh \
/ubuntu/install/only_office/install_only_office.sh \
/ubuntu/install/signal/install_signal.sh \
/ubuntu/install/gimp/install_gimp.sh \
/ubuntu/install/zoom/install_zoom.sh \
/ubuntu/install/ansible/install_ansible.sh \
/ubuntu/install/telegram/install_telegram.sh \
/ubuntu/install/thunderbird/install_thunderbird.sh \
/ubuntu/install/slack/install_slack.sh \
/ubuntu/install/gamepad_utils/install_gamepad_utils.sh \
/ubuntu/install/cleanup/cleanup.sh"
# Copy install scripts
COPY ./src/ $INST_DIR
# Run installations
RUN \
for SCRIPT in $INST_SCRIPTS; do \
bash ${INST_DIR}${SCRIPT} || exit 1; \
done && \
$STARTUPDIR/set_user_permission.sh $HOME && \
rm -f /etc/X11/xinit/Xclients && \
chown 1000:0 $HOME && \
mkdir -p /home/kasm-user && \
chown -R 1000:0 /home/kasm-user && \
rm -Rf ${INST_DIR}
# Userspace Runtime
ENV HOME /home/kasm-user
WORKDIR $HOME
USER 1000
CMD ["--tail-log"]

View File

@ -0,0 +1,7 @@
# About This Image
This Image contains a browser-accessible Fedora 40 Desktop with various productivity and development apps installed.
![Screenshot][Image_Screenshot]
[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/image-screenshots/fedora-37-desktop.png "Image Screenshot"

View File

@ -0,0 +1,9 @@
# Live Demo
<a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/ubuntu-jammy-desktop.gif" width="640" height="360"></a>
**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank">Live Demo</a>.
<a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/UbuntuJammyDesktop.png" width="300" height="104"></a>
&lowast;*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.*

View File

@ -0,0 +1 @@
Fedora 40 desktop for Kasm Workspaces

View File

@ -0,0 +1,7 @@
# About This Image
This Image contains a browser-accessible Ubuntu Noble Desktop with various productivity and development apps installed.
![Screenshot][Image_Screenshot]
[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/ubuntu_jammy_desktop.png "Image Screenshot"

View File

@ -0,0 +1,9 @@
# Live Demo
<a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/ubuntu-jammy-desktop.gif" width="640" height="360"></a>
**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank">Live Demo</a>.
<a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/UbuntuJammyDesktop.png" width="300" height="104"></a>
&lowast;*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.*

View File

@ -0,0 +1 @@
Ubuntu productivity desktop for Kasm Workspaces

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y ansible dnf install -y ansible
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y gimp dnf install -y gimp
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all

View File

@ -7,7 +7,7 @@ if [ "$ARCH" == "amd64" ] ; then
exit 0 exit 0
fi fi
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y \ dnf install -y \
libreoffice-core \ libreoffice-core \
libreoffice-writer \ libreoffice-writer \

View File

@ -8,7 +8,7 @@ if [ "$ARCH" == "arm64" ] ; then
fi fi
curl -L -o only_office.rpm "https://download.onlyoffice.com/install/desktop/editors/linux/onlyoffice-desktopeditors.$(arch).rpm" curl -L -o only_office.rpm "https://download.onlyoffice.com/install/desktop/editors/linux/onlyoffice-desktopeditors.$(arch).rpm"
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf localinstall -y only_office.rpm dnf localinstall -y only_office.rpm
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all

View File

@ -21,7 +21,7 @@ version=4.12.2
# This path may not be accurate once arm64 support arrives. Specifically I don't know if it will still be under x64 # This path may not be accurate once arm64 support arrives. Specifically I don't know if it will still be under x64
wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.fc21.x86_64.rpm -O slack.rpm wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.fc21.x86_64.rpm -O slack.rpm
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf localinstall -y slack.rpm dnf localinstall -y slack.rpm
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all

View File

@ -8,7 +8,7 @@ fi
rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo
dnf install -y sublime-text dnf install -y sublime-text
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then

View File

@ -14,7 +14,7 @@ if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almali
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all
fi fi
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]]; then elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then
dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
dnf install -y terraform dnf install -y terraform
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then

View File

@ -3,7 +3,7 @@ set -ex
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/x64/g') ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/x64/g')
wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm
dnf localinstall -y vs_code.rpm dnf localinstall -y vs_code.rpm
else else
@ -20,7 +20,7 @@ chown 1000:1000 $HOME/Desktop/code.desktop
rm vs_code.rpm rm vs_code.rpm
# Conveniences for python development # Conveniences for python development
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y python3-setuptools python3-virtualenv dnf install -y python3-setuptools python3-virtualenv
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all

View File

@ -8,7 +8,7 @@ fi
wget -q https://zoom.us/client/latest/zoom_$(arch).rpm wget -q https://zoom.us/client/latest/zoom_$(arch).rpm
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf localinstall -y zoom_$(arch).rpm dnf localinstall -y zoom_$(arch).rpm
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
if grep -q "ID=debian" /etc/os-release; then if grep -q "ID=debian" /etc/os-release || grep -q "VERSION_CODENAME=noble" /etc/os-release; then
apt-get update apt-get update
apt-get install -y ansible apt-get install -y ansible
else else

View File

@ -9,8 +9,8 @@ if [[ "${DISTRO}" == @(debian|opensuse|ubuntu) ]] && [ ${ARCH} = 'amd64' ] && [
exit 0 exit 0
fi fi
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y chromium dnf install -y chromium
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all
@ -124,7 +124,7 @@ if [ "${DISTRO}" != "opensuse" ] && ! grep -q "ID=debian" /etc/os-release && ! g
cp /usr/bin/chromium-browser /usr/bin/chromium cp /usr/bin/chromium-browser /usr/bin/chromium
fi fi
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
cat >> $HOME/.config/mimeapps.list <<EOF cat >> $HOME/.config/mimeapps.list <<EOF
[Default Applications] [Default Applications]
x-scheme-handler/http=${REAL_BIN}.desktop x-scheme-handler/http=${REAL_BIN}.desktop

View File

@ -4,7 +4,7 @@ set -ex
# Distro package cleanup # Distro package cleanup
if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
yum clean all yum clean all
elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then
dnf clean all dnf clean all
elif [ "${DISTRO}" == "opensuse" ]; then elif [ "${DISTRO}" == "opensuse" ]; then
zypper clean --all zypper clean --all

View File

@ -55,7 +55,7 @@ chmod +x /usr/bin/desktop_ready
# Desktop icon # Desktop icon
DESKTOP_FILE="chocolate-doom.desktop" DESKTOP_FILE="chocolate-doom.desktop"
if [ "$(lsb_release -cs)" == "jammy" ]; then if [[ "$(lsb_release -cs)" == @(jammy|noble) ]]; then
DESKTOP_FILE="org.chocolate_doom.Doom.desktop" DESKTOP_FILE="org.chocolate_doom.Doom.desktop"
fi fi
sed -i 's#Exec=chocolate-doom#Exec=/usr/games/chocolate-doom#g' /usr/share/applications/${DESKTOP_FILE} sed -i 's#Exec=chocolate-doom#Exec=/usr/games/chocolate-doom#g' /usr/share/applications/${DESKTOP_FILE}

View File

@ -13,15 +13,15 @@ set_desktop_icon() {
} }
echo "Install Firefox" echo "Install Firefox"
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y firefox p11-kit dnf install -y firefox p11-kit
else else
yum install -y firefox p11-kit yum install -y firefox p11-kit
fi fi
elif [ "${DISTRO}" == "opensuse" ]; then elif [ "${DISTRO}" == "opensuse" ]; then
zypper install -yn p11-kit-tools MozillaFirefox zypper install -yn p11-kit-tools MozillaFirefox
elif grep -q Jammy /etc/os-release; then elif grep -q Jammy /etc/os-release || grep -q Noble /etc/os-release; then
if [ ! -f '/etc/apt/preferences.d/mozilla-firefox' ]; then if [ ! -f '/etc/apt/preferences.d/mozilla-firefox' ]; then
add-apt-repository -y ppa:mozillateam/ppa add-apt-repository -y ppa:mozillateam/ppa
echo ' echo '
@ -68,8 +68,8 @@ for LANG in ${LANGS}; do
done done
# Cleanup and install flash if supported # Cleanup and install flash if supported
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all
fi fi
@ -87,7 +87,7 @@ else
echo "Firefox flash player not supported on arm64 Ubuntu Focal Skipping" echo "Firefox flash player not supported on arm64 Ubuntu Focal Skipping"
elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release; then elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release; then
echo "Firefox flash player not supported on Debian" echo "Firefox flash player not supported on Debian"
elif ! grep -q Jammy /etc/os-release; then elif grep -q Focal /etc/os-release; then
# Plugin to support running flash videos for sites like vimeo # Plugin to support running flash videos for sites like vimeo
apt-get update apt-get update
apt-get install -y browser-plugin-freshplayer-pepperflash apt-get install -y browser-plugin-freshplayer-pepperflash
@ -101,14 +101,14 @@ else
fi fi
fi fi
if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
# Update firefox to utilize the system certificate store instead of the one that ships with firefox # Update firefox to utilize the system certificate store instead of the one that ships with firefox
rm -f /usr/lib/firefox/libnssckbi.so rm -f /usr/lib/firefox/libnssckbi.so
ln /usr/lib/$(arch)-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox/libnssckbi.so ln /usr/lib/$(arch)-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox/libnssckbi.so
fi fi
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
if [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then
preferences_file=/usr/lib64/firefox/browser/defaults/preferences/firefox-redhat-default-prefs.js preferences_file=/usr/lib64/firefox/browser/defaults/preferences/firefox-redhat-default-prefs.js
else else
preferences_file=/usr/lib64/firefox/browser/defaults/preferences/all-redhat.js preferences_file=/usr/lib64/firefox/browser/defaults/preferences/all-redhat.js
@ -121,7 +121,7 @@ else
fi fi
# Disabling default first run URL for Debian based images # Disabling default first run URL for Debian based images
if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
cat >"$preferences_file" <<EOF cat >"$preferences_file" <<EOF
pref("datareporting.policy.firstRunURL", ""); pref("datareporting.policy.firstRunURL", "");
pref("datareporting.policy.dataSubmissionEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false);
@ -132,7 +132,7 @@ pref("browser.aboutwelcome.enabled", false);
EOF EOF
fi fi
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
# Creating a default profile # Creating a default profile
chown -R root:root $HOME chown -R root:root $HOME
firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm" firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm"
@ -156,7 +156,7 @@ else
firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm" firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm"
fi fi
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
set_desktop_icon set_desktop_icon
fi fi
@ -164,13 +164,13 @@ fi
# based off the installation path. Because that path will be static for our deployments we can assume the hash # based off the installation path. Because that path will be static for our deployments we can assume the hash
# and thus assign our profile to the default for the installation # and thus assign our profile to the default for the installation
if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL
[Install4F96D1932A9F858E] [Install4F96D1932A9F858E]
Default=kasm Default=kasm
Locked=1 Locked=1
EOL EOL
elif [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39) ]]; then elif [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL
[Install11457493C5A56847] [Install11457493C5A56847]
Default=kasm Default=kasm
@ -179,7 +179,7 @@ EOL
fi fi
# Desktop Icon FIxes # Desktop Icon FIxes
if [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora39) ]]; then if [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora39|fedora40) ]]; then
sed -i 's#Icon=/usr/lib/firefox#Icon=/usr/lib64/firefox#g' $HOME/Desktop/firefox.desktop sed -i 's#Icon=/usr/lib/firefox#Icon=/usr/lib64/firefox#g' $HOME/Desktop/firefox.desktop
fi fi

View File

@ -2,8 +2,8 @@
set -e set -e
# Just remove xdg-open for Jammy # Just remove xdg-open for Jammy and Noble
if [ "$(lsb_release -cs)" == "jammy" ]; then if [[ "$(lsb_release -cs)" == @(jammy|noble) ]]; then
rm -f /usr/bin/xdg-open rm -f /usr/bin/xdg-open
exit 0 exit 0
fi fi

View File

@ -1,13 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
if [[ "${DISTRO}" == @(oracle8|rockylinux8|almalinux8) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux8|almalinux8) ]]; then
dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret remmina-plugins-spice xdotool dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret remmina-plugins-spice xdotool
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all
fi fi
elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora37|fedora38|fedora39) ]]; then elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret xdotool dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret xdotool
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all
@ -23,7 +23,7 @@ elif [ "${DISTRO}" == "opensuse" ]; then
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
zypper clean --all zypper clean --all
fi fi
elif grep -q "ID=debian" /etc/os-release; then elif grep -q "ID=debian" /etc/os-release || grep -q "VERSION_CODENAME=noble" /etc/os-release; then
apt-get update apt-get update
apt-get install -y remmina remmina-plugin-rdp remmina-plugin-secret xdotool apt-get install -y remmina remmina-plugin-rdp remmina-plugin-secret xdotool
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then

View File

@ -12,11 +12,11 @@ version=$(curl -q https://slack.com/downloads/linux | grep page-downloads__hero_
echo Detected slack version $version echo Detected slack version $version
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|opensuse) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40|opensuse) ]]; then
wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.el8.x86_64.rpm wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.el8.x86_64.rpm
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf localinstall -y slack-${version}-0.1.el8.x86_64.rpm dnf localinstall -y slack-${version}-0.1.el8.x86_64.rpm
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all

View File

@ -4,6 +4,10 @@ set -ex
# Install Telegram # Install Telegram
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
if [ "${ARCH}" == "arm64" ] ; then if [ "${ARCH}" == "arm64" ] ; then
# Telegram is not available for noble aarch64
if grep -q "VERSION_CODENAME=noble" /etc/os-release; then
exit 0
fi
apt-get update apt-get update
apt-get install -y telegram-desktop apt-get install -y telegram-desktop
if grep -q bookworm /etc/os-release; then if grep -q bookworm /etc/os-release; then

View File

@ -2,8 +2,8 @@
set -ex set -ex
# Install # Install
if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
dnf install -y thunderbird dnf install -y thunderbird
if [ -z ${SKIP_CLEAN+x} ]; then if [ -z ${SKIP_CLEAN+x} ]; then
dnf clean all dnf clean all
@ -48,7 +48,7 @@ Pin-Priority: 1001
fi fi
# Desktop icon # Desktop icon
if [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]]; then if [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then
cp /usr/share/applications/mozilla-thunderbird.desktop $HOME/Desktop/ cp /usr/share/applications/mozilla-thunderbird.desktop $HOME/Desktop/
chmod +x $HOME/Desktop/mozilla-thunderbird.desktop chmod +x $HOME/Desktop/mozilla-thunderbird.desktop
else else

View File

@ -32,7 +32,7 @@ elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then
wireguard-tools \ wireguard-tools \
zenity \ zenity \
jq jq
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]] ; then elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]] ; then
dnf install -y \ dnf install -y \
openresolv \ openresolv \
openvpn \ openvpn \