KASM-4027 rhel 9 desktop image

2024-11-21 15:43:09 +01:00 · 2024-11-08 20:13:12 +00:00 · 2024-11-08 20:13:12 +00:00 · 5812eee6ca
commit 5812eee6ca
parent 7600e4580c
26 changed files with 121 additions and 36 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -11,7 +11,7 @@ variables:
  BASE_TAG: "develop"
  USE_PRIVATE_IMAGES: 0
  KASM_RELEASE: "1.16.0"
-  TEST_INSTALLER: "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.f2d6e1.tar.gz"
+  TEST_INSTALLER: "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.16.0.a1d5b7.tar.gz"
 before_script:
  - export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')"

--- a/ci-scripts/template-vars.yaml
+++ b/ci-scripts/template-vars.yaml
@ -517,6 +517,19 @@ multiImages:
      - src/ubuntu/install/cleanup/**
      - src/ubuntu/install/chromium/**
      - src/ubuntu/install/slack/**
+  - name: rhel-9-desktop
+    singleapp: false
+    base: core-rhel-9
+    dockerfile: dockerfile-kasm-rhel-9-desktop
+    changeFiles:
+      - dockerfile-kasm-rhel-9-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: parrotos-6-desktop
    singleapp: false
    base: core-parrotos-6
--- a/55
+++ b/55
@ -0,0 +1,55 @@
+ARG BASE_TAG="develop"
+ARG BASE_IMAGE="core-rhel-9"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
+
+USER root
+
+ENV DISTRO=oracle9
+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/obs/install_obs.sh \
+                  /oracle/install/ansible/install_ansible.sh \
+                  /oracle/install/terraform/install_terraform.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"]
--- a/docs/rhel-9-desktop/README.md
+++ b/docs/rhel-9-desktop/README.md
@ -0,0 +1,7 @@
+# About This Image
+
+This Image contains a browser-accessible Red Hat Linux 9 Desktop with various productivity and development apps installed.
+
+![Screenshot][Image_Screenshot]
+
+[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/rhel-9-desktop.png "Image Screenshot"
--- a/docs/rhel-9-desktop/demo.txt
+++ b/docs/rhel-9-desktop/demo.txt
@ -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.*
--- a/docs/rhel-9-desktop/description.txt
+++ b/docs/rhel-9-desktop/description.txt
@ -0,0 +1 @@
+Red Hat Linux 9 desktop for Kasm Workspaces
--- a/src/oracle/install/ansible/install_ansible.sh
+++ b/src/oracle/install/ansible/install_ansible.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf install -y ansible
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/oracle/install/gimp/install_gimp.sh
+++ b/src/oracle/install/gimp/install_gimp.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -ex
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf install -y gimp
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/oracle/install/libre_office/install_libre_office.sh
+++ b/src/oracle/install/libre_office/install_libre_office.sh
@ -7,7 +7,7 @@ if [ "$ARCH" == "amd64" ] ; then
  exit 0
 fi

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf install -y \
    libreoffice-core \
    libreoffice-writer \
--- a/src/oracle/install/only_office/install_only_office.sh
+++ b/src/oracle/install/only_office/install_only_office.sh
@ -8,7 +8,7 @@ if [ "$ARCH" == "arm64" ] ; then
 fi

 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|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf localinstall -y only_office.rpm
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/oracle/install/slack/install_slack.sh
+++ b/src/oracle/install/slack/install_slack.sh
@ -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
 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|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf localinstall -y slack.rpm
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/oracle/install/sublime_text/install_sublime_text.sh
+++ b/src/oracle/install/sublime_text/install_sublime_text.sh
@ -8,7 +8,7 @@ fi

 rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo
  dnf install -y sublime-text
  if [ -z ${SKIP_CLEAN+x} ]; then
--- a/src/oracle/install/terraform/install_terraform.sh
+++ b/src/oracle/install/terraform/install_terraform.sh
@ -8,7 +8,7 @@ if [ "${ARCH}" == "arm64" ] ; then
    exit 0
 fi

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8) ]]; then
  dnf config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
  dnf install -y terraform
  if [ -z ${SKIP_CLEAN+x} ]; then
--- a/src/oracle/install/vs_code/install_vs_code.sh
+++ b/src/oracle/install/vs_code/install_vs_code.sh
@ -3,7 +3,7 @@ set -ex
 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
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm
  dnf localinstall -y vs_code.rpm
 else
@ -20,7 +20,7 @@ chown 1000:1000 $HOME/Desktop/code.desktop
 rm vs_code.rpm

 # Conveniences for python development
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf install -y python3-setuptools python3-virtualenv
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/oracle/install/zoom/install_zoom.sh
+++ b/src/oracle/install/zoom/install_zoom.sh
@ -8,7 +8,7 @@ fi


 wget -q https://zoom.us/client/latest/zoom_$(arch).rpm
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf localinstall -y zoom_$(arch).rpm
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/ubuntu/install/chrome/install_chrome.sh
+++ b/src/ubuntu/install/chrome/install_chrome.sh
@ -10,13 +10,13 @@ if [ "$ARCH" == "arm64" ] ; then
  exit 0
 fi	

-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8) ]]; then
+if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8) ]]; then
  if [ ! -z "${CHROME_VERSION}" ]; then
    wget https://dl.google.com/linux/chrome/rpm/stable/x86_64/google-chrome-stable-${CHROME_VERSION}.x86_64.rpm -O chrome.rpm
  else
    wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm -O chrome.rpm
  fi
-  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8) ]]; then
+  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8) ]]; then
    dnf localinstall -y chrome.rpm
    if [ -z ${SKIP_CLEAN+x} ]; then
      dnf clean all
@ -79,7 +79,7 @@ EOL
 chmod +x /usr/bin/google-chrome
 cp /usr/bin/google-chrome /usr/bin/chrome

-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse) ]]; then
+if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse) ]]; then
  cat >> $HOME/.config/mimeapps.list <<EOF
    [Default Applications]
    x-scheme-handler/http=google-chrome.desktop
--- a/src/ubuntu/install/chromium/install_chromium.sh
+++ b/src/ubuntu/install/chromium/install_chromium.sh
@ -9,7 +9,7 @@ if [[ "${DISTRO}" == @(debian|opensuse|ubuntu) ]] && [ ${ARCH} = 'amd64' ] && [
  exit 0
 fi

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf install -y chromium
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
@ -117,7 +117,7 @@ if [ "${DISTRO}" != "opensuse" ] && ! grep -q "ID=debian" /etc/os-release && ! g
  cp /usr/bin/chromium-browser /usr/bin/chromium
 fi

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
  cat >> $HOME/.config/mimeapps.list <<EOF
    [Default Applications]
    x-scheme-handler/http=${REAL_BIN}.desktop
--- a/src/ubuntu/install/cleanup/cleanup.sh
+++ b/src/ubuntu/install/cleanup/cleanup.sh
@ -2,7 +2,7 @@
 set -ex

 # Distro package cleanup
-if [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora39|fedora40|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then
+if [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora39|fedora40|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then
  dnf clean all
 elif [ "${DISTRO}" == "opensuse" ]; then
  zypper clean --all
--- a/src/ubuntu/install/firefox/install_firefox.sh
+++ b/src/ubuntu/install/firefox/install_firefox.sh
@ -13,7 +13,7 @@ set_desktop_icon() {
 }

 echo "Install Firefox"
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf install -y firefox p11-kit
 elif [ "${DISTRO}" == "opensuse" ]; then
  zypper install -yn p11-kit-tools MozillaFirefox
@ -70,7 +70,7 @@ for LANG in ${LANGS}; do
 done

 # Cleanup and install flash if supported
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
  fi
@ -97,7 +97,7 @@ else
  fi
 fi

-if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
  # Update firefox to utilize the system certificate store instead of the one that ships with firefox
  if grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release && [ "${ARCH}" == "arm64" ]; then
    rm -f /usr/lib/firefox-esr/libnssckbi.so
@ -108,7 +108,7 @@ if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almali
  fi
 fi

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  if [[ "${DISTRO}" == @(fedora39|fedora40) ]]; then
    preferences_file=/usr/lib64/firefox/browser/defaults/preferences/firefox-redhat-default-prefs.js
  else
@ -128,7 +128,7 @@ else
 fi

 # Disabling default first run URL for Debian based images
-if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
 cat >"$preferences_file" <<EOF
 pref("datareporting.policy.firstRunURL", "");
 pref("datareporting.policy.dataSubmissionEnabled", false);
@ -139,7 +139,7 @@ pref("browser.aboutwelcome.enabled", false);
 EOF
 fi

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
  # Creating a default profile
  chown -R root:root $HOME
  firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm"
@ -163,7 +163,7 @@ else
  firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm"
 fi

-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
  set_desktop_icon
 fi

@ -171,13 +171,13 @@ fi
 #   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

-if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
 cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL
 [Install4F96D1932A9F858E]
 Default=kasm
 Locked=1
 EOL
-elif [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
+elif [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
 cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL
 [Install11457493C5A56847]
 Default=kasm
@ -186,7 +186,7 @@ EOL
 fi

 # Desktop Icon FIxes
-if [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(rockylinux9|oracle9|rhel9|almalinux9|fedora39|fedora40) ]]; then
  sed -i 's#Icon=/usr/lib/firefox#Icon=/usr/lib64/firefox#g' $HOME/Desktop/firefox.desktop
 fi

--- a/src/ubuntu/install/kali/install_kali.sh
+++ b/src/ubuntu/install/kali/install_kali.sh
@ -11,7 +11,7 @@ apt-get install -y \
  faraday \
  fern-wifi-cracker \
  guymager \
-  hydra-gtk \
+  hydra \
  legion \
  ophcrack \
  ophcrack-cli \
--- a/src/ubuntu/install/nextcloud/install_nextcloud.sh
+++ b/src/ubuntu/install/nextcloud/install_nextcloud.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -ex
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8) ]]; then
  dnf install -y nextcloud-client
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/ubuntu/install/remmina/install_remmina.sh
+++ b/src/ubuntu/install/remmina/install_remmina.sh
@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -ex

-if [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  if [[ "${DISTRO}" == @(oracle8|rockylinux8|almalinux8) ]]; then
    dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret remmina-plugins-spice xdotool
    if [ -z ${SKIP_CLEAN+x} ]; then
      dnf clean all
    fi
-  elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora39|fedora40) ]]; then
+  elif [[ "${DISTRO}" == @(rockylinux9|oracle9|rhel9|almalinux9|fedora39|fedora40) ]]; then
    dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret xdotool
    if [ -z ${SKIP_CLEAN+x} ]; then
      dnf clean all
--- a/src/ubuntu/install/slack/install_slack.sh
+++ b/src/ubuntu/install/slack/install_slack.sh
@ -12,11 +12,11 @@ version=$(curl -q https://slack.com/downloads/linux | grep page-downloads__hero_
 echo Detected slack version $version


-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40|opensuse) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40|opensuse) ]]; then

  wget -q https://downloads.slack-edge.com/desktop-releases/linux/x64/${version}/slack-${version}-0.1.el8.x86_64.rpm

-  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
    dnf localinstall -y slack-${version}-0.1.el8.x86_64.rpm
    if [ -z ${SKIP_CLEAN+x} ]; then
      dnf clean all
--- a/src/ubuntu/install/thunderbird/install_thunderbird.sh
+++ b/src/ubuntu/install/thunderbird/install_thunderbird.sh
@ -2,7 +2,7 @@
 set -ex

 # Install
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|rhel9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
  dnf install -y thunderbird
  if [ -z ${SKIP_CLEAN+x} ]; then
    dnf clean all
--- a/src/ubuntu/install/tracelabs/install_tracelabs.sh
+++ b/src/ubuntu/install/tracelabs/install_tracelabs.sh
@ -12,7 +12,7 @@ apt-get install -y \
  faraday \
  fern-wifi-cracker \
  guymager \
-  hydra-gtk \
+  hydra \
  legion \
  ophcrack \
  ophcrack-cli \
--- a/src/ubuntu/install/vpn/install_vpn.sh
+++ b/src/ubuntu/install/vpn/install_vpn.sh
@ -19,7 +19,7 @@ elif [ "${DISTRO}" == "alpine" ]; then
    wireguard-tools \
    zenity \
    jq
-elif [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux8|rockylinux9|almalinux8|almalinux9) ]] ; then
+elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux8|rockylinux9|almalinux8|almalinux9) ]] ; then
  dnf install -y epel-release
  dnf install -y \
    openvpn \