Merge branch 'feature/KASM-2267-more-aarch64-images' into 'develop'

build java-dev sublime telegram tor-browser and doom on aarch64

Closes KASM-2267

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

.gitlab-ci.yml

@@ -4,7 +4,7 @@ services:
 variables:
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
   PLATFORM: "linux/amd64"
-  ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,ubuntu-focal-desktop,vlc,vs-code,"
+  ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,ubuntu-focal-desktop,vlc,vs-code,doom,sublime-text,tor-browser,java-dev,telegram,"
   CORE_IMAGE_TAG: "develop"
   CORE_IMAGE: "core-ubuntu-focal"
   USE_PRIVATE_IMAGES: 0

src/ubuntu/install/eclipse/install_eclipse.sh

@@ -3,7 +3,7 @@
 ECLIPSE_VER_DATE="2021-12"
 
 cd /tmp
-wget -q -O eclipse.tar.gz "https://mirrors.xmission.com/eclipse/technology/epp/downloads/release/${ECLIPSE_VER_DATE}/R/eclipse-java-${ECLIPSE_VER_DATE}-R-linux-gtk-x86_64.tar.gz"
+wget -q -O eclipse.tar.gz "https://mirrors.xmission.com/eclipse/technology/epp/downloads/release/${ECLIPSE_VER_DATE}/R/eclipse-java-${ECLIPSE_VER_DATE}-R-linux-gtk-$(arch).tar.gz"
 tar -xzf eclipse.tar.gz -C /opt
 
 ECLIPSE_ICON="/opt/eclipse/plugins/$(ls /opt/eclipse/plugins/ | grep -m 1 org.eclipse.platform_)/eclipse128.png"

src/ubuntu/install/sublime_text/install_sublime_text.sh

@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 set -ex
 
-ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
-if [ "$ARCH" == "arm64" ] ; then
-  echo "Sublimetext not supported on arm64, skipping installation"
-  exit 0
-fi
-
 apt-get update
 wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | apt-key add -
 apt-get install -y apt-transport-https

src/ubuntu/install/telegram/custom_startup.sh

@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
 set -ex
+if [ "$(arch)" == "aarch64" ]; then
+  START_COMMAND="/usr/bin/telegram-desktop"
+  PGREP="telegram-desktop"
+else 
   START_COMMAND="/opt/Telegram/Telegram"
   PGREP="Telegram"
+fi
 export MAXIMIZE="false"
 MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"

src/ubuntu/install/telegram/install_telegram.sh

@@ -4,11 +4,10 @@ set -ex
 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
 
 if [ "${ARCH}" == "arm64" ] ; then
-    echo "Telegram for arm64 currently not supported, skipping install"
-    exit 0
-fi
-
-
+  apt-get update
+  apt-get install -y telegram-desktop
+  cp /usr/share/applications/telegramdesktop.desktop $HOME/Desktop/telegram.desktop
+else
   wget -q https://telegram.org/dl/desktop/linux -O /tmp/telegram.tgz
   tar -xvf /tmp/telegram.tgz -C /opt/
   rm -rf /tmp/telegram.tgz
@@ -33,4 +32,5 @@ X-GNOME-UsesNotifications=true
 EOL
   chmod +x /usr/share/applications/telegram.desktop
   cp /usr/share/applications/telegram.desktop $HOME/Desktop/telegram.desktop
+fi
 chown 1000:1000 $HOME/Desktop/telegram.desktop

src/ubuntu/install/torbrowser/install_torbrowser.sh

@@ -5,8 +5,14 @@ echo "Install TorBrowser"
 apt-get install -y xz-utils curl
 TOR_HOME=$HOME/tor-browser/
 mkdir -p $TOR_HOME
+if [ "$(arch)" == "aarch64" ]; then
+  SF_VERSION=$(curl -sI https://sourceforge.net/projects/tor-browser-ports/files/latest/download | awk -F'(ports/|/tor)' '/location/ {print $3}')
+  FULL_TOR_URL="https://downloads.sourceforge.net/project/tor-browser-ports/${SF_VERSION}/tor-browser-linux-arm64-${SF_VERSION}_en-US.tar.xz"
+else
   TOR_URL=$(curl -q https://www.torproject.org/download/ | grep downloadLink | grep linux64 | sed 's/.*href="//g'  | cut -d '"' -f1 | head -1)
-wget --quiet https://www.torproject.org/${TOR_URL} -O /tmp/torbrowser.tar.xz
+  FULL_TOR_URL="https://www.torproject.org/${TOR_URL}"
+fi
+wget --quiet "${FULL_TOR_URL}" -O /tmp/torbrowser.tar.xz
 tar -xJf /tmp/torbrowser.tar.xz -C $TOR_HOME
 rm /tmp/torbrowser.tar.xz