diff --git a/src/ubuntu/install/audio/install_audio.sh b/src/ubuntu/install/audio/install_audio.sh index 28f3855..639b1aa 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -98,8 +98,8 @@ fi mkdir -p /var/run/pulse -WS_COMMIT_ID="b4afb14706a88bf536bd6b1604599bb712b46cb8" -WS_BRANCH="feature_KASM-8210_bump_dep_versions_for_1_19_0" +WS_COMMIT_ID="f056f949e79a55217ec44c8fc4c79418ada0c05e" +WS_BRANCH="develop" WS_COMMIT_ID_SHORT=$(echo "${WS_COMMIT_ID}" | cut -c1-6) cd $STARTUPDIR diff --git a/src/ubuntu/install/audio_input/install_audio_input.sh b/src/ubuntu/install/audio_input/install_audio_input.sh index 59a5242..7927de4 100644 --- a/src/ubuntu/install/audio_input/install_audio_input.sh +++ b/src/ubuntu/install/audio_input/install_audio_input.sh @@ -2,8 +2,8 @@ ### every exit != 0 fails the script set -e -COMMIT_ID="ae8e9e27b63fc3b77e3a2548221b73a84c2fd655" -BRANCH="feature_KASM-8210_bump_dep_versions_for_1_19_0" +COMMIT_ID="d42f0ca30311beaed2c9833fbd71ba56ddae7ec6" +BRANCH="develop" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') diff --git a/src/ubuntu/install/gamepad/install_gamepad.sh b/src/ubuntu/install/gamepad/install_gamepad.sh index 927e1cd..be6b661 100644 --- a/src/ubuntu/install/gamepad/install_gamepad.sh +++ b/src/ubuntu/install/gamepad/install_gamepad.sh @@ -2,8 +2,8 @@ ### every exit != 0 fails the script set -e -COMMIT_ID="c121c3febb3814c035b1599ab7eb3a4936e9bebf" -BRANCH="feature_KASM-8210_bump_dep_versions_for_1_19_0" +COMMIT_ID="55a4cc861d77b6bbe736b23cc40669cf0a35706a" +BRANCH="develop" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') diff --git a/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh b/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh index 8a7445b..dde21b9 100644 --- a/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh +++ b/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash set -ex -COMMIT_ID="5e341e906b134a9ac8593c012bbd075b86a987b5" -BRANCH="feature_KASM-8210_bump_dep_versions_for_1_19_0" +COMMIT_ID="35f2831bf51b218de58f890cd16a8382c54b2215" +BRANCH="develop" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') diff --git a/src/ubuntu/install/printer/install_printer.sh b/src/ubuntu/install/printer/install_printer.sh index c2704e5..ecff886 100755 --- a/src/ubuntu/install/printer/install_printer.sh +++ b/src/ubuntu/install/printer/install_printer.sh @@ -32,8 +32,8 @@ 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="10b313b0961391db732e8bad7f7428aa720dff17" -BRANCH="feature_KASM-8210_bump_dep_versions_for_1_19_0" +COMMIT_ID="8a006be9c56e179daa80293fde4f37cfa8d600cb" +BRANCH="develop" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') diff --git a/src/ubuntu/install/recorder/install_recorder.sh b/src/ubuntu/install/recorder/install_recorder.sh index c6b1bb4..812205e 100644 --- a/src/ubuntu/install/recorder/install_recorder.sh +++ b/src/ubuntu/install/recorder/install_recorder.sh @@ -14,8 +14,8 @@ elif [ "${DISTRO}" == "opensuse" ]; then zypper install -ny xhost fi -COMMIT_ID="1b437b2bf83e3da95f73be7e138d2ccd64722269" -BRANCH="feature_KASM-8210_bump_dep_versions_for_1_19_0" +COMMIT_ID="65b1f19630c2e317b40613f150deaed97e64aa93" +BRANCH="develop" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') diff --git a/src/ubuntu/install/squid/install/install_squid.sh b/src/ubuntu/install/squid/install/install_squid.sh index e8e5d2d..b56444c 100644 --- a/src/ubuntu/install/squid/install/install_squid.sh +++ b/src/ubuntu/install/squid/install/install_squid.sh @@ -16,7 +16,7 @@ else fi # Intall squid -SQUID_COMMIT='b5d77ed3feefd38c3331db092531e0fdfe220693' +SQUID_COMMIT='eeb77407cf8ae952078520d8f4f231958a0ad98f' if grep -q Focal /etc/os-release || grep -q bullseye /etc/os-release || [[ "${DISTRO}" == @(oracle8|almalinux8|rockylinux8) ]]; then wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm-squid-builder/${SQUID_COMMIT}/output/kasm-squid-builder_ubuntu11_${ARCH}.tar.gz | tar -xzf - -C / elif [[ "${DISTRO}" == "alpine" ]]; then @@ -75,8 +75,8 @@ sasldb_path: /etc/sasl2/memcached-sasldb2 EOL -COMMIT_ID="2b3a81b718582f4fe0ceed5b88473283049f73a8" -BRANCH="feature_KASM-8210_migrate_to_poetry" +COMMIT_ID="2472f2c1606244d311addc16dab436f5f56d5467" +BRANCH="develop" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) diff --git a/src/ubuntu/install/webcam/install_webcam.sh b/src/ubuntu/install/webcam/install_webcam.sh index 18a863b..62fc890 100644 --- a/src/ubuntu/install/webcam/install_webcam.sh +++ b/src/ubuntu/install/webcam/install_webcam.sh @@ -8,8 +8,8 @@ elif [ "${DISTRO}" == "oracle8" ]; then DISTRO=oracle fi -COMMIT_ID="5491b6fde2f7321b79f9cd8783add87e77cd9116" -BRANCH="feature_KASM-8210_bump_dep_versions_for_1_19_0" +COMMIT_ID="32c8f6f60395503152c55333bffb66df887bd4b5" +BRANCH="develop" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')