Merge branch 'feature/KASM-2015_alternate_arch_services' into 'develop'

KASM-2015 Update auxilary services to support multi-arch

Closes KASM-2015

See merge request kasm-technologies/internal/workspaces-core-images!19
This commit is contained in:
Justin Travis 2021-10-18 03:27:54 +00:00
commit 04e28186bc
4 changed files with 11 additions and 18 deletions

View File

@ -1,7 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
### every exit != 0 fails the script ### every exit != 0 fails the script
set -e set -ex
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
echo "Install Audio Requirements" echo "Install Audio Requirements"
if [ "${DISTRO}" == "centos" ] ; then if [ "${DISTRO}" == "centos" ] ; then
yum install -y curl git yum install -y curl git
@ -16,5 +17,5 @@ fi
cd $STARTUPDIR cd $STARTUPDIR
mkdir jsmpeg mkdir jsmpeg
wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_websocket_relay/5b1e1eaa251f7a423a818056e2e8cdb66c17ef98/kasm_websocket_relay_master.5b1e1e.tar.gz | tar xz --strip 1 -C $STARTUPDIR/jsmpeg wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_websocket_relay/68ee0a0311d2ba8a9f2c206ec89e3abce6451f92/kasm_websocket_relay_${DISTRO/kali/ubuntu}_${ARCH}_develop.68ee0a.tar.gz | tar xz --strip 1 -C $STARTUPDIR/jsmpeg
chmod +x $STARTUPDIR/jsmpeg/kasm_audio_out-linux chmod +x $STARTUPDIR/jsmpeg/kasm_audio_out-linux

View File

@ -1,10 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
### every exit != 0 fails the script ### every exit != 0 fails the script
set -e set -e
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
mkdir -p $STARTUPDIR/audio_input mkdir -p $STARTUPDIR/audio_input
if [ "$DISTRO" = centos ]; then wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/3b599f999efdb349969cf607b6ed636c4501108d/kasm_audio_input_server_${DISTRO/kali/ubuntu}_${ARCH}_develop.3b599f.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/
wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/17b516ead4504f180358bf11bd735cb5eb28d032/kasm_audio_input_server_centos_core_feature_KASM-1476_centos_build_microphone_server.17b516.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/
else
wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/627e9301c4140cd70c82a798b33c2acae2860e28/kasm_audio_input_server_develop.627e93.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/
fi

View File

@ -1,11 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
mkdir $STARTUPDIR/upload_server mkdir $STARTUPDIR/upload_server
if [ -f /etc/centos-release ]; then wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/839a3b9ce63569aaee4f7d62bd31ffb20184a393/kasm_upload_service_${DISTRO/kali/ubuntu}_${ARCH}_develop.839a3b.tar.gz -O /tmp/kasm_upload_server.tar.gz
wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/7a9ab9203b5b16502349bcf8bd8be1527d5e6cad/kasm_upload_service_centos_1.2.0.7a9ab9.tar.gz -O /tmp/kasm_upload_server.tar.gz
else
wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/742b7f4ba521ee89969d2eddfbda0e7bd619944d/kasm_upload_service_1.2.0.742b7f.tar.gz -O /tmp/kasm_upload_server.tar.gz
fi
tar -xvf /tmp/kasm_upload_server.tar.gz -C $STARTUPDIR/upload_server tar -xvf /tmp/kasm_upload_server.tar.gz -C $STARTUPDIR/upload_server
rm /tmp/kasm_upload_server.tar.gz rm /tmp/kasm_upload_server.tar.gz

View File

@ -1,6 +1,8 @@
# update squid conf with user info # update squid conf with user info
set -ex set -ex
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
if [ "$DISTRO" = centos ]; then if [ "$DISTRO" = centos ]; then
useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy
fi fi
@ -41,11 +43,8 @@ sasldb_path: /etc/sasl2/memcached-sasldb2
EOL EOL
if [ "$DISTRO" = centos ]; then KASM_SQUID_ADAPTER=https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/d03389153257831e2378a3629c560e4d34f7e772/kasm_squid_adapter_${DISTRO/kali/ubuntu}_${ARCH}_develop.d03389.tar.gz
KASM_SQUID_ADAPTER=https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/f06293b2e585dbee75728e84293fe61386289c27/kasm_squid_adapter_centos_feature_KASM-1474_centos_build.f06293.tar.gz
else
KASM_SQUID_ADAPTER=https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/1cc3b450ee0bfb1aa76a0c3330f8d6e86b365448/kasm_squid_adapter_develop.1cc3b4.tar.gz
fi
wget -qO- ${KASM_SQUID_ADAPTER} | tar xz -C /etc/squid/ wget -qO- ${KASM_SQUID_ADAPTER} | tar xz -C /etc/squid/
ls -la /etc/squid ls -la /etc/squid
chmod +x /etc/squid/kasm_squid_adapter chmod +x /etc/squid/kasm_squid_adapter