Merge branch 'bugfix/KASM-7060-update_chromium_install_logic_develop' into 'develop'

install chromium from debian bookworm repos for ubuntu - develop

Closes KASM-7060

See merge request kasm-technologies/internal/workspaces-images!256

src/ubuntu/install/chromium/custom_startup.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -ex
-START_COMMAND="chromium-browser"
+START_COMMAND="chromium"
 PGREP="chromium"
 MAXIMIZE="true"
 DEFAULT_ARGS=""

src/ubuntu/install/chromium/install_chromium.sh

@@ -32,55 +32,31 @@ else
   apt-get update
   apt-get install -y software-properties-common ttf-mscorefonts-installer
   apt-get remove -y chromium-browser-l10n chromium-codecs-ffmpeg chromium-browser
-  
-  # Chromium on Ubuntu 19.10 or newer uses snap to install which is not
-  # currently compatible with docker containers. The new install will pull
-  # deb files from archive.ubuntu.com for ubuntu 18.04 and install them.
-  # This will work until 18.04 goes to an unsupported status.
-  if [ ${ARCH} = 'amd64' ] ;
-  then
-    chrome_url="http://archive.ubuntu.com/ubuntu/pool/universe/c/chromium-browser/"
-  else
-    chrome_url="http://ports.ubuntu.com/pool/universe/c/chromium-browser/"
-  fi
 
-  chromium_codecs_data=$(curl ${chrome_url})
+  # Install from debian bookworm repos
-  chromium_codecs_data=$(grep "chromium-codecs-ffmpeg-extra_" <<< "${chromium_codecs_data}")
+  mkdir -p /etc/apt/keyrings
-  chromium_codecs_data=$(grep "18\.04" <<< "${chromium_codecs_data}")
+  curl -fsSL https://ftp-master.debian.org/keys/archive-key-12.asc | sudo tee /etc/apt/keyrings/debian-archive-key-12.asc
-  chromium_codecs_data=$(grep "${ARCH}" <<< "${chromium_codecs_data}")
+  echo "deb [signed-by=/etc/apt/keyrings/debian-archive-key-12.asc] http://deb.debian.org/debian bookworm main" | sudo tee /etc/apt/sources.list.d/debian-bookworm.list
-  chromium_codecs_data=$(sed -n 's/.*<a href="//p' <<< "${chromium_codecs_data}")
+  echo -e "Package: *\nPin: release a=bookworm\nPin-Priority: 100" | sudo tee /etc/apt/preferences.d/debian-bookworm
-  chromium_codecs_data=$(sed -n 's/">.*//p' <<< "${chromium_codecs_data}")
+  apt-get update
-  echo "Chromium codec deb to download: ${chromium_codecs_data}"
+  apt install -y chromium --no-install-recommends
 
-  chromium_data=$(curl ${chrome_url})
+  # Cleanup debian bookworm repos
-  chromium_data=$(grep "chromium-browser_" <<< "${chromium_data}")
+  rm /etc/apt/sources.list.d/debian-bookworm.list
-  chromium_data=$(grep "18\.04" <<< "${chromium_data}")
+  rm /etc/apt/preferences.d/debian-bookworm
-  chromium_data=$(grep "${ARCH}" <<< "${chromium_data}")
+  rm /etc/apt/keyrings/debian-archive-key-12.asc
-  chromium_data=$(sed -n 's/.*<a href="//p' <<< "${chromium_data}")
+  apt-get update
-  chromium_data=$(sed -n 's/">.*//p' <<< "${chromium_data}")
-  echo "Chromium browser deb to download: ${chromium_data}"
 
-  echo "The things to download"
-  echo "${chrome_url}${chromium_codecs_data}"
-  echo "${chrome_url}${chromium_data}"
-
-  wget "${chrome_url}${chromium_codecs_data}"
-  wget "${chrome_url}${chromium_data}"
-
-  apt-get install -y ./"${chromium_codecs_data}"
-  apt-get install -y ./"${chromium_data}"
-
-  rm "${chromium_codecs_data}"
-  rm "${chromium_data}"
   if [ -z ${SKIP_CLEAN+x} ]; then
   apt-get autoclean
   rm -rf \
     /var/lib/apt/lists/* \
     /var/tmp/*
   fi
+
 fi
 
-if grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release; then
+if grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release || grep -q "ID=ubuntu" /etc/os-release; then
   REAL_BIN=chromium
 else
   REAL_BIN=chromium-browser
@@ -113,7 +89,7 @@ fi
 EOL
 chmod +x /usr/bin/${REAL_BIN}
 
-if [ "${DISTRO}" != "opensuse" ] && ! grep -q "ID=debian" /etc/os-release && ! grep -q "ID=kali" /etc/os-release && ! grep -q "ID=parrot" /etc/os-release; then
+if [ "${DISTRO}" != "opensuse" ] && ! grep -q "ID=debian" /etc/os-release && ! grep -q "ID=kali" /etc/os-release && ! grep -q "ID=parrot" /etc/os-release && ! grep -q "ID=ubuntu" /etc/os-release; then
   cp /usr/bin/chromium-browser /usr/bin/chromium
 fi
 

src/ubuntu/install/nextcloud/install_nextcloud.sh

@@ -23,7 +23,7 @@ else
   apt-get install -y software-properties-common
   add-apt-repository -y ppa:nextcloud-devs/client
   apt update
-  apt install -y nextcloud-client
+  apt install -y nextcloud-desktop
   if [ -z ${SKIP_CLEAN+x} ]; then
     apt-get autoclean
     rm -rf \