KASM-2193 Updating images to support Ubuntu 20.04

.gitlab-ci.yml

@@ -4,7 +4,10 @@ services:
 variables:
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
   PLATFORM: "linux/amd64"
-  ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,vlc,vs-code,"
+  ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,ubuntu-focal-desktop,vlc,vs-code,"
+  CORE_IMAGE_TAG: "develop"
+  CORE_IMAGE: "core-ubuntu-focal"
+  USE_PRIVATE_IMAGES: 0
 
 stages:
   - build
@@ -16,7 +19,65 @@ before_script:
   - export SANITIZED_ROLLING_BRANCH=${SANITIZED_BRANCH}-rolling
 
 # Jobs for the develop and release branches. They should push to the private and public repos
-build:
+build_browser_images:
+  stage: build
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} based on ${CORE_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
+
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH  -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
+  only:
+    - develop
+    - /^release\/.*$/
+  except:
+    - schedules
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [chrome, chromium, firefox, firefox-mobile, tor-browser, edge, brave]
+
+build_app_images:
+  stage: build
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} based on ${CORE_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
+
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH  -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
+  only:
+    - develop
+    - /^release\/.*$/
+  except:
+    - schedules
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord]
+
+build_ubuntu_desktop_images:
   stage: build
   image: ${ORG_NAME}/docker-buildx-private:develop
   script:
@@ -30,9 +91,10 @@ build:
     # Ensure readme and description files are present
     - ls docs/$KASM_IMAGE/README.md
     - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; CORE_IMAGE=$CORE_IMAGE-private; else PRIVATE=""; fi;
 
-    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH  -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_TAG="develop" -f dockerfile-kasm-$KASM_IMAGE .
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH  -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg PRIVATE=$PRIVATE  --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
-
   only:
     - develop
     - /^release\/.*$/
@@ -42,20 +104,48 @@ build:
     - aws-autoscale
   parallel:
     matrix:
-      - KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-bionic-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-bionic-dind, ubuntu-bionic-dind-rootless, tracelabs, java-dev ]
+      - KASM_IMAGE: [desktop, desktop-deluxe, ubuntu-focal-desktop, ubuntu-focal-dind, ubuntu-focal-dind-rootless]
 
+build_non_ubuntu:
+  stage: build
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; else PRIVATE=""; fi;
+
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH  -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
+  only:
+    - develop
+    - /^release\/.*$/
+  except:
+    - schedules
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [centos-7-desktop, tracelabs]
 
 
 
 # These jobs should run on the feature/bugfix branches - anything that is not the develop or release branches. It should only push images to the private repos
 
-build_dev:
+build_dev_browser_images:
   stage: build
   image: ${ORG_NAME}/docker-buildx-private:develop
   script:
     - BUILD_PLATFORM=$PLATFORM
     - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
-    - echo "Building ${KASM_IMAGE} for platforms ${BUILD_PLATFORM}"
+    - echo "Building ${KASM_IMAGE} based on ${CORE_IMAGE} for platforms ${BUILD_PLATFORM}"
     # to get qemu ready
     - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
     # to prepare the buildx env
@@ -63,9 +153,12 @@ build_dev:
     # Ensure readme and description files are present
     - ls docs/$KASM_IMAGE/README.md
     - ls docs/$KASM_IMAGE/description.txt
-    # Equivilant to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
     # The only way to push multiple architectures to the same tag is to use buildx.
-    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg BASE_TAG="develop" -f dockerfile-kasm-$KASM_IMAGE .
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
   except:
     - develop
     - /^release\/.*$/
@@ -73,12 +166,155 @@ build_dev:
     - aws-autoscale
   parallel:
     matrix:
-      - KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-bionic-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-bionic-dind, ubuntu-bionic-dind-rootless, tracelabs, java-dev ]
+      - KASM_IMAGE: [chrome, chromium, firefox, firefox-mobile, tor-browser, edge, brave]
 
+build_dev_app_images:
+  stage: build
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} based on ${CORE_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # The only way to push multiple architectures to the same tag is to use buildx.
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
+  except:
+    - develop
+    - /^release\/.*$/
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord]
+
+build_dev_ubuntu_desktop_images:
+  stage: build
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; CORE_IMAGE=$CORE_IMAGE-private; else PRIVATE=""; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # The only way to push multiple architectures to the same tag is to use buildx.
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
+  except:
+    - develop
+    - /^release\/.*$/
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [desktop, desktop-deluxe, ubuntu-focal-desktop, ubuntu-focal-dind, ubuntu-focal-dind-rootless]
+
+build_dev_non_ubuntu:
+  stage: build
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    - if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; else PRIVATE=""; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # The only way to push multiple architectures to the same tag is to use buildx.
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
+  except:
+    - develop
+    - /^release\/.*$/
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [centos-7-desktop, tracelabs]
 
 
 # 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:
+build_schedules_browser_images:
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  stage: build
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} based on ${CORE_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # The only way to push multiple architectures to the same tag is to use buildx.
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
+  only:
+    - schedules
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [chrome, chromium, firefox, firefox-mobile, tor-browser, edge, brave]
+        CORE_IMAGE: [core-ubuntu-bionic, core-ubuntu-focal]
+
+build_schedules_app_images:
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  stage: build
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} based on ${CORE_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # The only way to push multiple architectures to the same tag is to use buildx.
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
+  only:
+    - schedules
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord]
+        CORE_IMAGE: [core-ubuntu-bionic, core-ubuntu-focal]
+
+build_schedules_ubuntu_desktop_images:
   image: ${ORG_NAME}/docker-buildx-private:develop
   stage: build
   script:
@@ -92,17 +328,46 @@ build_schedules:
     # Ensure readme and description files are present
     - ls docs/$KASM_IMAGE/README.md
     - ls docs/$KASM_IMAGE/description.txt
-    # Equivilant to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # Check for private variable to build against private core images
+    - if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; CORE_IMAGE=$CORE_IMAGE-private; else PRIVATE=""; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
     # The only way to push multiple architectures to the same tag is to use buildx.
-    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
   only:
     - schedules
   tags:
     - aws-autoscale
   parallel:
     matrix:
-      - KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-bionic-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-bionic-dind, ubuntu-bionic-dind-rootless, tracelabs, java-dev ]
+      - KASM_IMAGE: [desktop, desktop-deluxe, ubuntu-focal-desktop, ubuntu-focal-dind, ubuntu-focal-dind-rootless]
 
+build_schedules_non_ubuntu:
+  image: ${ORG_NAME}/docker-buildx-private:develop
+  stage: build
+  script:
+    - BUILD_PLATFORM=$PLATFORM
+    - if [[ "${ARM_BUILDS}" == *",${KASM_IMAGE},"* ]]; then BUILD_PLATFORM="linux/amd64,linux/arm64"; fi;
+    - echo "Building ${KASM_IMAGE} for platforms ${BUILD_PLATFORM}"
+    # to get qemu ready
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    # to prepare the buildx env
+    - docker buildx create --use
+    # Ensure readme and description files are present
+    - ls docs/$KASM_IMAGE/README.md
+    - ls docs/$KASM_IMAGE/description.txt
+    - if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; else PRIVATE=""; fi;
+
+    # Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
+    # The only way to push multiple architectures to the same tag is to use buildx.
+    - docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
+  only:
+    - schedules
+  tags:
+    - aws-autoscale
+  parallel:
+    matrix:
+      - KASM_IMAGE: [centos-7-desktop, tracelabs]
 
 
 update_readmes:

dockerfile-kasm-brave

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-centos-7-desktop

@@ -1,5 +1,6 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-centos-7:$BASE_TAG
+ARG PRIVATE=""
+FROM kasmweb/core-centos-7$PRIVATE:$BASE_TAG
 USER root
 
 ENV DISTRO=centos

dockerfile-kasm-chrome

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-chrome-flash

@@ -1,11 +1,13 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########
@@ -27,7 +29,7 @@ COPY ./src/ubuntu/install/chrome/custom_startup.sh $STARTUPDIR/custom_startup.sh
 RUN chmod +x $STARTUPDIR/custom_startup.sh
 
 COPY ./src/ubuntu/install/chrome_flash $INST_SCRIPTS/chrome_flash/
-RUN bash $INST_SCRIPTS/chrome_flash/install_flash.sh  && rm -rf $INST_SCRIPTS/chrome_flash/
+RUN bash $INST_SCRIPTS/chrome_flash/install_flash.sh && rm -rf $INST_SCRIPTS/chrome_flash/
 
 ENV KASM_RESTRICTED_FILE_CHOOSER=1
 COPY ./src/ubuntu/install/gtk/ $INST_SCRIPTS/gtk/

dockerfile-kasm-chromium

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-desktop

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-desktop-deluxe

@@ -1,5 +1,6 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 
 USER root
 
@@ -11,6 +12,7 @@ WORKDIR $HOME
 ENV DEBIAN_FRONTEND noninteractive
 ENV KASM_RX_HOME $STARTUPDIR/kasmrx
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 
 # Add Kasm Branding
 RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png
@@ -95,7 +97,7 @@ COPY ./src/ubuntu/install/telegram $INST_SCRIPTS/telegram/
 RUN bash $INST_SCRIPTS/telegram/install_telegram.sh  && rm -rf $INST_SCRIPTS/telegram/
 
 ### Remove maxmius
-RUN apt-get remove -y maximus
+RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
 
 #ADD ./src/common/scripts $STARTUPDIR
 RUN $STARTUPDIR/set_user_permission.sh $HOME

dockerfile-kasm-discord

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-doom

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-edge

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-firefox

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-firefox-flash

@@ -1,11 +1,13 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########
@@ -27,7 +29,7 @@ COPY ./src/ubuntu/install/firefox/custom_startup.sh $STARTUPDIR/custom_startup.s
 RUN chmod +x $STARTUPDIR/custom_startup.sh
 
 COPY ./src/ubuntu/install/firefox_flash $INST_SCRIPTS/firefox_flash/
-RUN bash $INST_SCRIPTS/firefox_flash/install_flash.sh  && rm -rf $INST_SCRIPTS/firefox_flash/
+RUN bash $INST_SCRIPTS/firefox_flash/install_flash.sh && rm -rf $INST_SCRIPTS/firefox_flash/
 
 ENV KASM_RESTRICTED_FILE_CHOOSER=1
 COPY ./src/ubuntu/install/gtk/ $INST_SCRIPTS/gtk/

dockerfile-kasm-firefox-mobile

@@ -1,5 +1,6 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 
 USER root
 
@@ -11,6 +12,7 @@ WORKDIR $HOME
 ENV DEBIAN_FRONTEND noninteractive
 ENV KASM_RX_HOME $STARTUPDIR/kasmrx
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 
 # Install Firefox
 COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/

dockerfile-kasm-gimp

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-hunchly

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
-ENV INST_SCRIPTS $STARTUPDIR/install
+ENV INST_SCRIPTS $STARTUPDIR/
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-insomnia

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-java-dev

@@ -1,5 +1,6 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 
 USER root
 
@@ -11,6 +12,7 @@ WORKDIR $HOME
 ENV DEBIAN_FRONTEND noninteractive
 ENV KASM_RX_HOME $STARTUPDIR/kasmrx
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 
 
 ### Install Tools
@@ -54,7 +56,7 @@ COPY ./src/ubuntu/install/eclipse $INST_SCRIPTS/eclipse
 RUN bash $INST_SCRIPTS/eclipse/install_eclipse.sh && rm -rf $INST_SCRIPTS/eclipse/
 
 ### Remove maxmius
-RUN apt-get remove -y maximus
+RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
 
 #ADD ./src/common/scripts $STARTUPDIR
 RUN $STARTUPDIR/set_user_permission.sh $HOME

dockerfile-kasm-maltego

@@ -1,14 +1,20 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########
 
+# Maltego wants a browser installed and the default is Firefox, Install Firefox
+COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/
+COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/
+RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/
 
 COPY ./src/ubuntu/install/maltego $INST_SCRIPTS/maltego/
 RUN bash $INST_SCRIPTS/maltego/install_maltego.sh  && rm -rf $INST_SCRIPTS/maltego/
@@ -26,6 +32,9 @@ RUN apt-get remove -y xfce4-panel
 
 ######### End Customizations ###########
 
+#ADD ./src/common/scripts $STARTUPDIR
+RUN $STARTUPDIR/set_user_permission.sh $HOME
+
 RUN chown 1000:0 $HOME
 
 ENV HOME /home/kasm-user

dockerfile-kasm-only-office

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-postman

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-rdesktop

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-remmina

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-signal

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-slack

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-steam

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-sublime-text

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-teams

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-telegram

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-terminal

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-tor-browser

@@ -1,10 +1,16 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
+# TODO: Once we satisfy KASM-1423, move these to the core images instead
+ENV PULSE_RUNTIME_PATH "/tmp/pulse"
+ENV PULSE_STATE_PATH "/tmp/pulse"
+ENV PULSE_COOKIE "/tmp/pulse/cookie"
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-tracelabs

@@ -1,5 +1,6 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-kali-rolling:$BASE_TAG
+ARG PRIVATE=""
+FROM kasmweb/core-kali-rolling$PRIVATE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile

dockerfile-kasm-ubuntu-focal-desktop

@@ -1,5 +1,6 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG PRIVATE=""
+FROM kasmweb/core-ubuntu-focal$PRIVATE:$BASE_TAG
 
 USER root
 
@@ -11,6 +12,7 @@ WORKDIR $HOME
 ENV DEBIAN_FRONTEND noninteractive
 ENV KASM_RX_HOME $STARTUPDIR/kasmrx
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 
 
 ### Install Tools
@@ -91,7 +93,7 @@ COPY ./src/ubuntu/install/telegram $INST_SCRIPTS/telegram/
 RUN bash $INST_SCRIPTS/telegram/install_telegram.sh  && rm -rf $INST_SCRIPTS/telegram/
 
 ### Remove maxmius
-RUN apt-get remove -y maximus
+RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
 
 #ADD ./src/common/scripts $STARTUPDIR
 RUN $STARTUPDIR/set_user_permission.sh $HOME

dockerfile-kasm-ubuntu-focal-dind

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG PRIVATE=""
+FROM kasmweb/core-ubuntu-focal$PRIVATE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########
@@ -48,7 +50,7 @@ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
 RUN bash $INST_SCRIPTS/chrome/install_chrome.sh  && rm -rf $INST_SCRIPTS/chrome/
 
 ### Remove maxmius
-RUN apt-get remove -y maximus
+RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
 
 ######### End Customizations ###########
 

dockerfile-kasm-ubuntu-focal-dind-rootless

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG PRIVATE=""
+FROM kasmweb/core-ubuntu-focal$PRIVATE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########
@@ -45,7 +47,7 @@ COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
 RUN bash $INST_SCRIPTS/chrome/install_chrome.sh  && rm -rf $INST_SCRIPTS/chrome/
 
 ### Remove maxmius
-RUN apt-get remove -y maximus
+RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
 
 RUN chown 1000:0 $HOME
 

dockerfile-kasm-vlc

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-vmware-horizon

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-vs-code

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-zoom

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

dockerfile-kasm-zsnes

@@ -1,10 +1,12 @@
 ARG BASE_TAG="develop"
-FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
+ARG BASE_IMAGE="core-ubuntu-focal"
+FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
 ENV HOME /home/kasm-default-profile
 ENV STARTUPDIR /dockerstartup
 ENV INST_SCRIPTS $STARTUPDIR/install
+ENV BASE_IMAGE $BASE_IMAGE
 WORKDIR $HOME
 
 ######### Customize Container Here ###########

docs/ubuntu-bionic-desktop/README.md

@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Ubuntu Bionic Desktop with various productivity and development apps installed.
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/image-screenshots/ubuntu-bionic-desktop.png "Image Screenshot"

docs/ubuntu-focal-desktop/README.md

@@ -0,0 +1,7 @@
+# About This Image
+
+This Image contains a browser-accessible Ubuntu Focal Desktop with various productivity and development apps installed.
+
+![Screenshot][Image_Screenshot]
+
+[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/image-screenshots/ubuntu-focal-desktop.png "Image Screenshot"

src/ubuntu/install/brave/custom_startup.sh

@@ -2,8 +2,12 @@
 set -ex
 START_COMMAND="brave-browser"
 PGREP="brave"
-MAXIMUS="false"
+MAXIMIZE="true"
-DEFAULT_ARGS="--start-maximized"
+DEFAULT_ARGS=""
+
+if [[ $MAXIMIZE == 'true' ]] ; then
+    DEFAULT_ARGS+=" --start-maximized"
+fi
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -53,10 +57,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null

src/ubuntu/install/chrome/custom_startup.sh

@@ -2,8 +2,12 @@
 set -ex
 START_COMMAND="google-chrome"
 PGREP="chrome"
-MAXIMUS="false"
+MAXIMIZE="true"
-DEFAULT_ARGS="--start-maximized"
+DEFAULT_ARGS=""
+
+if [[ $MAXIMIZE == 'true' ]] ; then
+    DEFAULT_ARGS+=" --start-maximized"
+fi
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -53,10 +57,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null

src/ubuntu/install/chrome_flash/install_flash.sh

@@ -5,7 +5,7 @@ set -ex
 # Configure chrome to use the pre-installed version , otherwise it will try and fetch it itself the first time it is
 # used which requires internet access, and it may possibly be removed from being downloaded in the future.
 
-echo "deb http://archive.canonical.com/ubuntu/ bionic partner" > /etc/apt/sources.list.d/canonical_partner.list
+echo "deb http://archive.canonical.com/ubuntu/ $(lsb_release -cs) partner" > /etc/apt/sources.list.d/canonical_partner.list
 apt-get update
 apt-get install -y  pepperflashplugin-nonfree
 rm /etc/apt/sources.list.d/canonical_partner.list

src/ubuntu/install/chromium/custom_startup.sh

@@ -2,8 +2,12 @@
 set -ex
 START_COMMAND="chromium-browser"
 PGREP="chromium"
-MAXIMUS="false"
+MAXIMIZE="true"
-DEFAULT_ARGS="--start-maximized"
+DEFAULT_ARGS=""
+
+if [[ $MAXIMIZE == 'true' ]] ; then
+    DEFAULT_ARGS+=" --start-maximized"
+fi
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -51,11 +55,7 @@ kasm_startup() {
         URL=$LAUNCH_URL
     fi
 
-    if  [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ]  ; then
+    if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
-
-         if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi       
         
         while true
         do

src/ubuntu/install/chromium/install_chromium.sh

@@ -2,6 +2,7 @@
 set -ex
 
 CHROME_ARGS="--password-store=basic --no-sandbox  --ignore-gpu-blocklist --user-data-dir --no-first-run --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'"
+ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
 
 if [ "$DISTRO" = centos ]; then
   yum install -y chromium
@@ -10,7 +11,46 @@ else
   apt-get update
   apt-get install -y software-properties-common
   apt-get remove -y chromium-browser-l10n chromium-codecs-ffmpeg chromium-browser
-  apt-get install -y 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})
+  chromium_codecs_data=$(grep "chromium-codecs-ffmpeg-extra_" <<< "${chromium_codecs_data}")
+  chromium_codecs_data=$(grep "18\.04" <<< "${chromium_codecs_data}")
+  chromium_codecs_data=$(grep "${ARCH}" <<< "${chromium_codecs_data}")
+  chromium_codecs_data=$(sed -n 's/.*<a href="//p' <<< "${chromium_codecs_data}")
+  chromium_codecs_data=$(sed -n 's/">.*//p' <<< "${chromium_codecs_data}")
+  echo "Chromium codec deb to download: ${chromium_codecs_data}"
+
+  chromium_data=$(curl ${chrome_url})
+  chromium_data=$(grep "chromium-browser_" <<< "${chromium_data}")
+  chromium_data=$(grep "18\.04" <<< "${chromium_data}")
+  chromium_data=$(grep "${ARCH}" <<< "${chromium_data}")
+  chromium_data=$(sed -n 's/.*<a href="//p' <<< "${chromium_data}")
+  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}"
 fi
 
 sed -i 's/-stable//g' /usr/share/applications/chromium-browser.desktop

src/ubuntu/install/dind/custom_startup.sh

@@ -2,7 +2,8 @@
 set -ex
 START_COMMAND="/usr/bin/supervisord"
 PGREP="supervisord"
-MAXIMUS="false"
+MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="-n"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -26,6 +27,25 @@ done
 
 FORCE=$2
 
+kasm_exec() {
+    if [ -n "$OPT_URL" ] ; then
+        URL=$OPT_URL
+    elif [ -n "$1" ] ; then
+        URL=$1
+    fi
+
+    # Since we are execing into a container that already has the browser running from startup,
+    #  when we don't have a URL to open we want to do nothing. Otherwise a second browser instance would open.
+    if [ -n "$URL" ] ; then
+        /usr/bin/filter_ready
+        /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
+        sudo /usr/bin/supervisord -n &
+    else
+        echo "No URL specified for exec command. Doing nothing."
+    fi
+}
+
 kasm_startup() {
     if [ -n "$KASM_URL" ] ; then
         URL=$KASM_URL
@@ -35,10 +55,6 @@ kasm_startup() {
 
     if  [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ]  ; then
 
-         if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi       
-        
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -46,6 +62,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 sudo /usr/bin/supervisord -n &
                 set -e
             fi

src/ubuntu/install/dind_rootless/custom_startup.sh

@@ -2,7 +2,8 @@
 set -ex
 START_COMMAND="/home/kasm-user/bin/dockerd-rootless.sh"
 PGREP="dockerd"
-MAXIMUS="false"
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -26,6 +27,25 @@ done
 
 FORCE=$2
 
+kasm_exec() {
+    if [ -n "$OPT_URL" ] ; then
+        URL=$OPT_URL
+    elif [ -n "$1" ] ; then
+        URL=$1
+    fi
+
+    # Since we are execing into a container that already has the browser running from startup,
+    #  when we don't have a URL to open we want to do nothing. Otherwise a second browser instance would open.
+    if [ -n "$URL" ] ; then
+        /usr/bin/filter_ready
+        /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
+        $START_COMMAND $ARGS
+    else
+        echo "No URL specified for exec command. Doing nothing."
+    fi
+}
+
 kasm_startup() {
     if [ -n "$KASM_URL" ] ; then
         URL=$KASM_URL
@@ -46,7 +66,8 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
-                $START_COMMAND $ARGS 
+                bash ${MAXIMIZE_SCRIPT} &
+                $START_COMMAND $ARGS
                 set -e
             fi
             sleep 1

src/ubuntu/install/discord/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="/usr/share/discord/Discord"
 PGREP="Discord"
-MAXIMUS="false"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Discord"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,9 +63,9 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL &
                 set -e
-                maximus &
             fi
             sleep 1
         done

src/ubuntu/install/discord/install_discord.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 set -ex
 apt-get update
-apt-get install -y maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
 curl -L -o discord.deb  "https://discord.com/api/download?platform=linux&format=deb"
 apt-get install -y ./discord.deb
 rm discord.deb

src/ubuntu/install/doom/custom_startup.sh

@@ -3,7 +3,8 @@ set -ex
 START_COMMAND="/usr/games/chocolate-doom"
 PGREP="chocolate-doom"
 DEFAULT_ARGS=""
-MAXIMUS="false"
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -38,6 +39,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +55,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -65,6 +63,7 @@ kasm_startup() {
                 /usr/bin/desktop_ready
                 set +e
                 source $STARTUPDIR/generate_container_user
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL &
                 set -e
             fi

src/ubuntu/install/edge/custom_startup.sh

@@ -2,8 +2,12 @@
 set -ex
 START_COMMAND="microsoft-edge"
 PGREP="msedge"
-MAXIMUS="false"
+MAXIMIZE="true"
-DEFAULT_ARGS="--start-maximized"
+DEFAULT_ARGS=""
+
+if [[ $MAXIMIZE == 'true' ]] ; then
+    DEFAULT_ARGS+=" --start-maximized"
+fi
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -55,10 +59,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null

src/ubuntu/install/firefox/install_firefox.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -xe
 
+ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
+
 set_centos_desktop_icon() {
   sed -i -e 's!Icon=.\+!Icon=/usr/share/icons/hicolor/48x48/apps/firefox.png!' "$HOME/Desktop/firefox.desktop"
 }
@@ -18,10 +20,15 @@ fi
 if [ "$DISTRO" = centos ]; then
   yum clean all
 else
-  # Plugin to support running flash videos for sites like vimeo
+  if [ "$ARCH" == "arm64" ] && [ "$(lsb_release -cs)" == "focal" ] ; then
-  apt-get install -y browser-plugin-freshplayer-pepperflash
+    echo "Firefox flash player not supported on arm64 Ubuntu Focal Skipping"
-  apt-mark hold firefox
+  else
-  apt-get clean -y
+    # Plugin to support running flash videos for sites like vimeo
+    apt-get update
+    apt-get install -y browser-plugin-freshplayer-pepperflash
+    apt-mark hold firefox
+    apt-get clean -y
+  fi
 fi
 
 if [ "$DISTRO" != centos ]; then

src/ubuntu/install/firefox_flash/install_flash.sh

@@ -5,7 +5,7 @@ set -ex
 # Update firefox to use the PPAPI plugin as it includes more features not available in the NPAPI versoin
 # https://help.ubuntu.com/18.04/ubuntu-help/net-install-flash.html.en
 
-echo "deb http://archive.canonical.com/ubuntu/ bionic partner" > /etc/apt/sources.list.d/canonical_partner.list
+echo "deb http://archive.canonical.com/ubuntu/ $(lsb_release -cs) partner" > /etc/apt/sources.list.d/canonical_partner.list
 apt-get update
 apt-get install -y browser-plugin-freshplayer-pepperflash adobe-flashplugin
 rm /etc/apt/sources.list.d/canonical_partner.list

src/ubuntu/install/gimp/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="gimp"
 PGREP="gimp"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="GNU Image Manipulation Program"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -52,10 +55,6 @@ kasm_startup() {
     fi
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
-
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
         
         while true
         do
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/gimp/install_gimp.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -ex
 apt-get update
-apt-get install -y gimp maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
+apt-get install -y gimp
 cp /usr/share/applications/gimp.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/gimp.desktop

src/ubuntu/install/horizon/custom_startup.sh

@@ -2,8 +2,11 @@
 set -ex
 START_COMMAND="vmware-view"
 PGREP="vmware-view"
-MAXIMUS="false"
+export MAXIMIZE="true"
-DEFAULT_ARGS="--fullscreen"
+export MAXIMIZE_NAME="VMware Horizon Client"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
+DEFAULT_ARGS=""
+
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -38,6 +41,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         cd $HOME
         $START_COMMAND $ARGS $OPT_URL
     else
@@ -54,16 +58,13 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
             then
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
+                bash ${MAXIMIZE_SCRIPT} &
                 cd $HOME
                 set +e
                 $START_COMMAND $ARGS $URL

src/ubuntu/install/horizon/install_horizons.sh

@@ -5,7 +5,7 @@ apt-get update
 apt-get install -y rdesktop
 
 
-wget https://download3.vmware.com/software/view/viewclients/CART22FQ1/VMware-Horizon-Client-2103-8.2.0-17742757.x64.bundle -O horizons.bundle
+wget https://download3.vmware.com/software/view/viewclients/CART22FH2/VMware-Horizon-Client-2111-8.4.0-18957622.x64.bundle -O horizons.bundle
 chmod +x ./horizons.bundle
 
 export TERM=dumb

src/ubuntu/install/insomnia/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="insomnia"
 PGREP="insomnia"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Insomnia"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/insomnia/install_insomnia.sh

@@ -11,4 +11,7 @@ chown 1000:1000 $HOME/Desktop/insomnia.desktop
 rm insomnia.deb
 
 # Conveniences for python development
-apt-get install -y  maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y  maximus
+fi

src/ubuntu/install/keeper/install_keeper.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex
 apt-get update
-wget https://www.keepersecurity.com/desktop_electron/Linux/repo/deb/keeperpasswordmanager_15.0.9_amd64.deb -O keeper.deb
+wget https://www.keepersecurity.com/desktop_electron/Linux/repo/deb/keeperpasswordmanager_16.4.4_amd64.deb -O keeper.deb
 apt-get install -y ./keeper.deb
 rm -rf keeper.deb
 sed -i 's@^Exec=.*@Exec=keeperpasswordmanager --no-sandbox %U@g' /usr/share/applications/keeperpasswordmanager.desktop

src/ubuntu/install/maltego/custom_startup.sh

@@ -2,7 +2,8 @@
 set -ex
 START_COMMAND="/usr/bin/maltego"
 PGREP="maltego"
-MAXIMUS="false"
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +39,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +55,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +62,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/mobile/configure_mobile.sh

@@ -9,7 +9,7 @@ set -ex
 # unclutter - Remove Mouse Cursor. This configuration will remove the cursor except for briefly when its clicked
 
 apt-get update
-apt-get install -y dconf-tools libglib2.0-bin mousetweaks onboard unclutter
+apt-get install -y dconf-cli dconf-editor libglib2.0-bin mousetweaks onboard unclutter
 
 rm -f /etc/xdg/autostart/orca-autostart.desktop
 

src/ubuntu/install/only_office/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="onlyoffice-desktopeditors"
 PGREP="DesktopEditors"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="DesktopEditors"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--system-title-bar"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/only_office/install_only_office.sh

@@ -18,5 +18,8 @@ chmod +x $HOME/Desktop/onlyoffice-desktopeditors.desktop
 # KASM-1541
 sed -i 's#/usr/bin/onlyoffice-desktopeditors %U$#bash -c "source ~/.bashrc \&\& /usr/bin/onlyoffice-desktopeditors %U"#' /usr/share/applications/onlyoffice-desktopeditors.desktop
 
-apt-get update
+if [[ "$(lsb_release -cs)" == "bionic" ]];
-apt-get install -y maximus
+then
+    apt-get update
+    apt-get install -y maximus
+fi

src/ubuntu/install/postman/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="/opt/Postman/Postman"
 PGREP="Postman"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Postman"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/postman/install_postman.sh

@@ -20,6 +20,8 @@ cp /usr/share/applications/postman.desktop $HOME/Desktop/postman.desktop
 chmod +x $HOME/Desktop/postman.desktop
 chown 1000:1000 $HOME/Desktop/postman.desktop
 
-
+if [[ "$(lsb_release -cs)" == "bionic" ]];
-apt-get update
+then
-apt-get install -y maximus
+    apt-get update
+    apt-get install -y maximus
+fi

src/ubuntu/install/rdesktop/custom_startup.sh

@@ -2,7 +2,8 @@
 set -ex
 START_COMMAND="rdesktop"
 PGREP="rdesktop"
-MAXIMUS="false"
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="-f localhost "
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +39,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +55,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
         
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-        
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -65,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/remmina/custom_startup.sh

@@ -3,7 +3,8 @@ set -ex
 START_COMMAND="remmina"
 PGREP="remmina"
 DEFAULT_ARGS=""
-MAXIMUS="false"
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 update_profile() {
@@ -51,6 +52,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -66,10 +68,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -77,6 +75,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 update_profile
                 $START_COMMAND $ARGS $URL $REMMINA_PROFILE
                 set -e

src/ubuntu/install/signal/custom_startup.sh

@@ -3,7 +3,9 @@ set -ex
 START_COMMAND="signal-desktop"
 PGREP="signal-desktop"
 DEFAULT_ARGS="--no-sandbox"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Signal"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ]; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi        
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/signal/install_signal.sh

@@ -8,9 +8,14 @@ if [ "${ARCH}" == "arm64" ] ; then
 fi
 
 
+# Signal only releases its desktop app under the xenial release, however it is compatible with all versions of Debian and Ubuntu that we support.
 wget -O- https://updates.signal.org/desktop/apt/keys.asc | apt-key add -
 echo "deb [arch=${ARCH}] https://updates.signal.org/desktop/apt xenial main" |  tee -a /etc/apt/sources.list.d/signal-xenial.list
 apt-get update
-apt-get install -y signal-desktop maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
+apt-get install -y signal-desktop
 cp /usr/share/applications/signal-desktop.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/signal-desktop.desktop

src/ubuntu/install/slack/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="slack"
 PGREP="slack"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Slack"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/slack/install_slack.sh

@@ -7,11 +7,27 @@ if [ "${ARCH}" == "arm64" ] ; then
     exit 0
 fi
 
-wget -q https://downloads.slack-edge.com/linux_releases/slack-desktop-4.3.2-${ARCH}.deb
+# This might prove fragile depending on how often slack changes it's
+# website though they don't have a link to always getting the latest version.
+# Perhaps a python script that parses the XML could be more robust
+#slack_data=$(curl "https://slack.com/downloads/linux")
+#version_data=$(grep -oPm1 '(?<=<span class="page-downloads__hero__meta-text__version">)[^<]+' <<< $slack_data)
+#version=$(sed -n -e 's/Version //p' <<< $version_data)
+#echo "Determined slack latest version to be: ${version}"
+
+# slack latest does not run with --no-sandbox, so we have to hard code to an older version.
+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-desktop-${version}-${ARCH}.deb
 apt-get update
-apt-get install -y maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
-apt-get install -y ./slack-desktop-4.3.2-${ARCH}.deb
+then
-rm slack-desktop-4.3.2-${ARCH}.deb
+    apt-get install -y maximus
+fi
+apt-get install -y ./slack-desktop-${version}-${ARCH}.deb
+rm slack-desktop-${version}-${ARCH}.deb
 sed -i 's,/usr/bin/slack,/usr/bin/slack --no-sandbox,g' /usr/share/applications/slack.desktop
 cp /usr/share/applications/slack.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/slack.desktop

src/ubuntu/install/steam/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="/usr/games/steam"
 PGREP="steam"
-MAXIMUS="true"
+# we used to maximize steam, but the window titles show up as N/A, I can't distingush between the main window and the chat window.
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/steam/install_steam.sh

@@ -2,7 +2,11 @@
 set -ex
 dpkg --add-architecture i386
 apt-get update
-apt-get install -y steam-installer  maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
+apt-get install -y steam-installer
 cp /usr/share/applications/steam.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/steam.desktop
 chown 1000:1000 $HOME/Desktop/steam.desktop

src/ubuntu/install/sublime_text/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="/opt/sublime_text/sublime_text"
 PGREP="sublime_text"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Sublime"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -52,10 +55,6 @@ kasm_startup() {
     fi
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
-    
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
 
         while true
         do
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/sublime_text/install_sublime_text.sh

@@ -12,7 +12,13 @@ wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | apt-key add -
 apt-get install -y apt-transport-https
 echo "deb https://download.sublimetext.com/ apt/stable/" |  tee /etc/apt/sources.list.d/sublime-text.list
 apt-get update
-apt-get install -y sublime-text maximus
+
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
+apt-get install -y sublime-text
+
 cp /usr/share/applications/sublime_text.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/sublime_text.desktop
 chown 1000:1000 $HOME/Desktop/sublime_text.desktop

src/ubuntu/install/teams/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="teams"
 PGREP="teams"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Teams"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/telegram/custom_startup.sh

@@ -2,7 +2,8 @@
 set -ex
 START_COMMAND="/opt/Telegram/Telegram"
 PGREP="Telegram"
-MAXIMUS="false"
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +39,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +55,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +62,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/terminal/custom_startup.sh

@@ -2,8 +2,10 @@
 set -ex
 START_COMMAND="xfce4-terminal"
 PGREP="xfce4-terminal "
-MAXIMUS="false"
+export MAXIMIZE="true"
-DEFAULT_ARGS="--fullscreen --hide-borders --hide-menubar --zoom=-1 --hide-scrollbar"
+export MAXIMIZE_NAME="Terminal"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
+DEFAULT_ARGS="--hide-borders --hide-menubar --zoom=-1 --hide-scrollbar"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
 options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 cd $HOME
                 $START_COMMAND $ARGS $URL
                 set -e

src/ubuntu/install/torbrowser/custom_startup.sh

@@ -2,7 +2,8 @@
 set -ex
 START_COMMAND="$HOME/tor-browser/tor-browser_en-US/Browser/start-tor-browser"
 PGREP="firefox.real"
-MAXIMUS="false"
+export MAXIMIZE="false"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--detach --allow-remote --new-tab"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -39,6 +40,7 @@ kasm_exec() {
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
         set +e
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
         set -e
     else
@@ -54,10 +56,6 @@ kasm_startup() {
     fi
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
-
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
         
         while true
         do
@@ -66,6 +64,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/tracelabs/install_tracelabs.sh

@@ -35,6 +35,8 @@ chown -R 1000:1000 \
     /usr/share/OnionSearch \
     /usr/share/toutatis 
 
+apt-get install -y python3-pip
+
 pip3 install --force-reinstall zope.event
 
 sed -i 's/sudo //g' /usr/share/applications/tl*.desktop

src/ubuntu/install/vlc/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="vlc"
 PGREP="vlc"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="VLC"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-metadata-network-access --no-qt-privacy-ask"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -52,10 +55,6 @@ kasm_startup() {
     fi
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
-
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
         
         while true
         do
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/vlc/install_vlc.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 set -ex
 apt-get update
-apt-get install -y vlc maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
+apt-get install -y vlc

src/ubuntu/install/vs_code/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="code"
 PGREP="code"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Visual Studio Code"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -53,10 +56,6 @@ kasm_startup() {
 
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
 
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
-        
         while true
         do
             if ! pgrep -x $PGREP > /dev/null
@@ -64,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/vs_code/install_vs_code.sh

@@ -14,5 +14,9 @@ rm vs_code.deb
 apt-get update
 apt-get install -y python3-setuptools \
                    python3-venv \
-                   python3-virtualenv \
+                   python3-virtualenv
-                   maximus
+
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi

src/ubuntu/install/zoho_email/install_zoho_email.sh

@@ -2,7 +2,7 @@
 set -ex
 mkdir -p /opt/zoho-mail-desktop
 cd /opt/zoho-mail-desktop
-wget -q https://downloads.zohocdn.com/zmail-desktop/linux/zoho-mail-desktop-x64-v1.1.12.AppImage -O zoho-mail-desktop.AppImage
+wget -q https://downloads.zohocdn.com/zmail-desktop/linux/zoho-mail-desktop-x64-v1.3.2.AppImage -O zoho-mail-desktop.AppImage
 chmod +x zoho-mail-desktop.AppImage
 ./zoho-mail-desktop.AppImage --appimage-extract
 rm zoho-mail-desktop.AppImage

src/ubuntu/install/zoom/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="zoom"
 PGREP="zoom"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="Zoom"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -51,13 +54,7 @@ kasm_startup() {
         URL=$LAUNCH_URL
     fi
 
-
-
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ] ; then
-    
-        if [[ $MAXIMUS == 'true' ]] ; then
-            maximus &
-        fi
 
         while true
         do
@@ -66,6 +63,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/zoom/install_zoom.sh

@@ -11,7 +11,10 @@ fi
 
 wget -q  https://zoom.us/client/latest/zoom_${ARCH}.deb
 apt-get update
-apt-get install -y maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
 apt-get install -y ./zoom_${ARCH}.deb
 rm zoom_amd64.deb
 cp /usr/share/applications/Zoom.desktop $HOME/Desktop/

src/ubuntu/install/zsnes/custom_startup.sh

@@ -2,7 +2,9 @@
 set -ex
 START_COMMAND="zsnes"
 PGREP="zsnes"
-MAXIMUS="true"
+export MAXIMIZE="true"
+export MAXIMIZE_NAME="ZSNES"
+MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS=""
 ARGS=${APP_ARGS:-$DEFAULT_ARGS}
 
@@ -38,6 +40,7 @@ kasm_exec() {
     if [ -n "$URL" ] ; then
         /usr/bin/filter_ready
         /usr/bin/desktop_ready
+        bash ${MAXIMIZE_SCRIPT} &
         $START_COMMAND $ARGS $OPT_URL
     else
         echo "No URL specified for exec command. Doing nothing."
@@ -51,10 +54,6 @@ kasm_startup() {
         URL=$LAUNCH_URL
     fi
 
-    if [[ $MAXIMUS == 'true' ]] ; then
-        maximus &
-    fi
-
     if [ -z "$DISABLE_CUSTOM_STARTUP" ] ||  [ -n "$FORCE" ]  ; then
         while true
         do
@@ -63,6 +62,7 @@ kasm_startup() {
                 /usr/bin/filter_ready
                 /usr/bin/desktop_ready
                 set +e
+                bash ${MAXIMIZE_SCRIPT} &
                 $START_COMMAND $ARGS $URL
                 set -e
             fi

src/ubuntu/install/zsnes/install_zsnes.sh

@@ -2,7 +2,11 @@
 set -ex
 dpkg --add-architecture i386
 apt-get update
-apt-get install -y zsnes maximus
+if [[ "$(lsb_release -cs)" == "bionic" ]];
+then
+    apt-get install -y maximus
+fi
+apt-get install -y zsnes