Merge branch 'develop' into feature/KASM-5378_recording_errata

src/ubuntu/install/audio_input/install_audio_input.sh

@@ -2,6 +2,12 @@
 ### every exit != 0 fails the script
 set -e
 
+COMMIT_ID="82d11b74e05be5175cd4096ad6463f83ded1f532"
+BRANCH="develop"
+COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
+
 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
+
 mkdir -p $STARTUPDIR/audio_input
-wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/58c23638d7bc7f9c90799d76a957cb02bfee153e/kasm_audio_input_server_${ARCH}_develop.58c236.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/
+wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/${COMMIT_ID}/kasm_audio_input_server_${ARCH}_${BRANCH}.${COMMIT_ID_SHORT}.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/
+echo "${BRANCH}:${COMMIT_ID}" > $STARTUPDIR/audio_input/kasm_audio_input_server.version

src/ubuntu/install/gamepad/install_gamepad.sh

@@ -2,7 +2,7 @@
 ### every exit != 0 fails the script
 set -e
 
-COMMIT_ID="717ef2e2e502983d06372d77939d3fc654dd8306"
+COMMIT_ID="ab327e308e000ddff2e5020a4a66e1fe4935d380"
 BRANCH="develop"
 COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
 
@@ -10,9 +10,9 @@ ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
 mkdir -p $STARTUPDIR/gamepad
 wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_gamepad_server/${COMMIT_ID}/kasm_gamepad_server_${ARCH}_${BRANCH}.${COMMIT_ID_SHORT}.tar.gz | tar -xvz -C $STARTUPDIR/gamepad/
 
-
 SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
 SCRIPT_PATH="$(realpath $SCRIPT_PATH)"
 
 mkdir -p /usr/share/extra/icons/
 cp ${SCRIPT_PATH}/gamepad.svg /usr/share/extra/icons/gamepad.svg
+echo "${BRANCH}:${COMMIT_ID}" > $STARTUPDIR/gamepad/kasm_gamepad_server.version

src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh

@@ -1,8 +1,14 @@
 #!/usr/bin/env bash
 set -ex
 
+COMMIT_ID="b234364fdef2dc96ac106ac5e4350c86c1f45021"
+BRANCH="develop"
+COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
+
 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
+
 mkdir $STARTUPDIR/upload_server
-wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/a22519ef70d05fd50099196ff6cb3dd8cb2ed13c/kasm_upload_service_${ARCH}_develop.a22519.tar.gz -O /tmp/kasm_upload_server.tar.gz
+wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/${COMMIT_ID}/kasm_upload_service_${ARCH}_${BRANCH}.${COMMIT_ID_SHORT}.tar.gz -O /tmp/kasm_upload_server.tar.gz
 tar -xvf /tmp/kasm_upload_server.tar.gz -C $STARTUPDIR/upload_server
 rm /tmp/kasm_upload_server.tar.gz
+echo "${BRANCH}:${COMMIT_ID}" > $STARTUPDIR/upload_server/kasm_upload_service.version

src/ubuntu/install/printer/install_printer.sh

@@ -22,7 +22,7 @@ fi
 # to the one watched by the printer service
 sed -i -r -e "s:^(Out\s).*:\1/home/kasm-user/PDF:" /etc/cups/cups-pdf.conf
 
-COMMIT_ID="ea156adceb0161d6aeb7eeb5371dc09fc5807867"
+COMMIT_ID="30ca302fa364051fd4c68982da7c5474a7bda6b8"
 BRANCH="develop"
 COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
 
@@ -30,5 +30,4 @@ ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
 
 mkdir -p $STARTUPDIR/printer
 wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_printer_service/${COMMIT_ID}/kasm_printer_service_${ARCH}_${BRANCH}.${COMMIT_ID_SHORT}.tar.gz | tar -xvz -C $STARTUPDIR/printer/
-
 echo "${BRANCH}:${COMMIT_ID}" > $STARTUPDIR/printer/kasm_printer.version

src/ubuntu/install/recorder/install_recorder.sh

@@ -2,6 +2,16 @@
 ### every exit != 0 fails the script
 set -e
 
+if [[ "${DISTRO}" == "alpine" ]]; then
+    apk add --no-cache \
+        runuser \
+        xhost
+elif [ "${DISTRO}" == "opensuse" ]; then
+    zypper ar -cfp 90 'https://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_$releasever/' packman
+    zypper -n --gpg-auto-import-keys dup --from packman --allow-vendor-change
+    zypper install -ny xhost
+fi
+
 COMMIT_ID="c1fb295699b044a731e4ef3369808cbd39da1567"
 BRANCH="feature_KASM-5446-refactor-kasm-recorder-service-to-attempt-to-eliminate-deadlocks-and-corrupt-videos"
 COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)

src/ubuntu/install/squid/install/install_squid.sh

@@ -90,9 +90,12 @@ sasldb_path: /etc/sasl2/memcached-sasldb2
 EOL
 
 
-KASM_SQUID_ADAPTER=https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/6e3703800654b05f1ac00c76d02474a6c1a21d17/kasm_squid_adapter_${ARCH}_develop.6e3703.tar.gz
+COMMIT_ID="1879ba54bb5ce515d3ac9f55675ba5fc984798d0"
+BRANCH="develop"
+COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
 
-wget -qO- ${KASM_SQUID_ADAPTER} | tar xz -C /etc/squid/
+wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/${COMMIT_ID}/kasm_squid_adapter_${ARCH}_${BRANCH}.${COMMIT_ID_SHORT}.tar.gz | tar xz -C /etc/squid/
+echo "${BRANCH}:${COMMIT_ID}" > /etc/squid/kasm_squid_adapter.version
 ls -la /etc/squid
 chmod +x /etc/squid/kasm_squid_adapter
 

src/ubuntu/install/webcam/install_webcam.sh

@@ -8,7 +8,7 @@ elif [ "${DISTRO}" == "oracle8" ]; then
   DISTRO=oracle
 fi
 
-COMMIT_ID="1631ff2c5f79ff6892c1d357343c47cb6f7c7a29"
+COMMIT_ID="23df7e27fe5c1536bd08da6bd58d65d1d7facb1b"
 BRANCH="develop"
 COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
 
@@ -16,5 +16,4 @@ ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
 
 mkdir -p $STARTUPDIR/webcam
 wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_webcam_server/${COMMIT_ID}/kasm_webcam_server_${ARCH}_${BRANCH}.${COMMIT_ID_SHORT}.tar.gz | tar -xvz -C $STARTUPDIR/webcam/
-
 echo "${BRANCH}:${COMMIT_ID}" > $STARTUPDIR/webcam/kasm_webcam_server.version