extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-07 08:04:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-1838_libjpeg-turbo-latest' into 'develop'

Browse Source 
Revert "Ubuntu: Build libjpeg-turbo from source"

Closes KASM-1838

See merge request kasm-technologies/internal/workspaces-core-images!20
This commit is contained in:
Matthew McClaskey 2021-10-25 13:03:19 +00:00
commit 6d6938499f
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockerfile-kasm-core
View File

@ -45,7 +45,7 @@ ENV DISPLAY=:1 \
VNC_RESOLUTION=1280x1024 \
VNC_PW=vncpassword \
VNC_VIEW_ONLY_PW=vncviewonlypassword \
LD_LIBRARY_PATH=/usr/local/lib/ \
LD_LIBRARY_PATH=/opt/libjpeg-turbo/lib64/:/usr/local/lib/ \
OMP_WAIT_POLICY=PASSIVE \
SHELL=/bin/bash \
START_XFCE4=$START_XFCE4 \

22
src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh
View File

@ -1,25 +1,37 @@
#!/usr/bin/env bash
set -e
install_libjpeg_turbo() {
local libjpeg_deb=libjpeg-turbo.deb
wget 'https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/a9434a300dbf85e65d0e9c212610a487fd10a308/output/bionic/libjpeg-turbo_2.1.2_amd64.deb' -O "$libjpeg_deb"
apt-get install -y "./$libjpeg_deb"
rm "$libjpeg_deb"
}
echo "Install KasmVNC server"
cd /tmp
if [ "${DISTRO}" == "kali" ] ;
then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/kasmvncserver_kali-rolling_0.9.3_master_bcad19_amd64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/a9434a300dbf85e65d0e9c212610a487fd10a308/kasmvncserver_kali-rolling_0.9.3_master_a9434a_amd64.deb"
elif [ "${DISTRO}" == "centos" ] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/a9434a300dbf85e65d0e9c212610a487fd10a308/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm"
else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/kasmvncserver_bionic_0.9.3_master_bcad19_amd64.deb"
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/a9434a300dbf85e65d0e9c212610a487fd10a308/kasmvncserver_bionic_0.9.3_master_a9434a_libjpeg-turbo-latest_amd64.deb"
fi
if [ "${DISTRO}" == "centos" ] ; then
wget $BUILD_URL -O kasmvncserver.rpm
wget "${BUILD_URL}" -O kasmvncserver.rpm
yum localinstall -y kasmvncserver.rpm
rm kasmvncserver.rpm
else
wget $BUILD_URL -O kasmvncserver.deb
if [ "$DISTRO" = "ubuntu" ]; then
install_libjpeg_turbo
fi
wget "${BUILD_URL}" -O kasmvncserver.deb
apt-get update
apt-get install -y gettext ssl-cert