From 40cbc7eef37e6964f6cbe30a939188c7b2c6033f Mon Sep 17 00:00:00 2001
From: Justin Travis <justin@kasmweb.com>
Date: Wed, 27 Oct 2021 20:28:22 -0400
Subject: [PATCH] KASM-2010 Add additional arm supported images.

---
 .gitlab-ci.yml                                  | 12 ++++++------
 src/ubuntu/install/telegram/install_telegram.sh |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 374763e..4f8fb20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ services:
 variables:
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
   PLATFORM: "linux/amd64"
-  ARM_BUILDS: ",chromium,firefox,ubuntu-bionic-desktop,terminal,remmina,rdesktop,"
+  ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,sublime-text,terminal,ubuntu-bionic-desktop,vlc,vs-code,"
 
 stages:
   - build
@@ -18,7 +18,7 @@ before_script:
 # Jobs for the develop and release branches. They should push to the private and public repos
 build:
   stage: build
-  image: kasmweb/docker-buildx-private:develop
+  image: ${ORG_NAME}/docker-buildx-private:develop
   script:
     - BUILD_PLATFORM=$PLATFORM
     - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
@@ -51,7 +51,7 @@ build:
 
 build_dev:
   stage: build
-  image: kasmweb/docker-buildx-private:develop
+  image: ${ORG_NAME}/docker-buildx-private:develop
   script:
     - BUILD_PLATFORM=$PLATFORM
     - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
@@ -79,7 +79,7 @@ build_dev:
 
 # These jobs are for the "rolling" release of the images. They should only run for scheduled jobs and should only push the rolling tags
 build_schedules:
-  image: kasmweb/docker-buildx-private:develop
+  image: ${ORG_NAME}/docker-buildx-private:develop
   stage: build
   script:
     - BUILD_PLATFORM=$PLATFORM
@@ -112,8 +112,8 @@ update_readmes:
     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@${README_TEMPLATE_REPO}
     - sed -e "/{about}/r docs/$KASM_IMAGE/README.md" -e "/{about}/d" dockerhub-readme-template/TEMPLATE.md > docs/$KASM_IMAGE/FULL_README.md
     - cat docs/$KASM_IMAGE/FULL_README.md
-    - docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE-private" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt"  kasmweb/dockerhub-updater:latest
-    - docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt"  kasmweb/dockerhub-updater:latest
+    - docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE-private" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt"  ${ORG_NAME}/dockerhub-updater:latest
+    - docker run -v $PWD:/workspace -e DOCKER_USERNAME="$README_USERNAME" -e DOCKER_PASSWORD="$README_PASSWORD" -e DOCKERHUB_REPOSITORY="${ORG_NAME}/$KASM_IMAGE" -e README_FILEPATH="/workspace/docs/$KASM_IMAGE/FULL_README.md" -e DESCRIPTION_FILEPATH="/workspace/docs/$KASM_IMAGE/description.txt"  ${ORG_NAME}/dockerhub-updater:latest
 
   only:
     variables:
diff --git a/src/ubuntu/install/telegram/install_telegram.sh b/src/ubuntu/install/telegram/install_telegram.sh
index b0a052f..281542d 100644
--- a/src/ubuntu/install/telegram/install_telegram.sh
+++ b/src/ubuntu/install/telegram/install_telegram.sh
@@ -1,5 +1,14 @@
 #!/usr/bin/env bash
 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
+
+
 wget -q https://telegram.org/dl/desktop/linux -O /tmp/telegram.tgz
 tar -xvf /tmp/telegram.tgz -C /opt/
 rm -rf /tmp/telegram.tgz