extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2025-06-25 22:41:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve KASM-3036 "Bugfix/ rpm to be on 0.9.4"

Browse Source
This commit is contained in:
Dmitry Maksyoma 2022-10-12 12:30:11 +00:00 committed by Matthew McClaskey
parent d1683ac78d
commit 769313610c
7 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dockerfile-kasm-core
View File

@ -86,6 +86,7 @@ ADD /src/common/resources/images/icon_kasm.png /usr/share/extra/icons/icon_kasm.
### Install kasm_vnc dependencies and binaries ### Install kasm_vnc dependencies and binaries
COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/ COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/
RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/ RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/
COPY ./src/common/install/kasm_vnc/kasmvnc.yaml /etc/kasmvnc/
### Install Kasm Upload Server ### Install Kasm Upload Server
COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/ COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/

1
dockerfile-kasm-core-centos
View File

@ -88,6 +88,7 @@ COPY /src/common/resources/images/$BG_IMG /usr/share/backgrounds/bg_default.png
### Install kasm_vnc dependencies and binaries ### Install kasm_vnc dependencies and binaries
COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/ COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/
RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/ RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/
COPY ./src/common/install/kasm_vnc/kasmvnc.yaml /etc/kasmvnc/
### Install Kasm Upload Server ### Install Kasm Upload Server
COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/ COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/

1
dockerfile-kasm-core-oracle
View File

@ -101,6 +101,7 @@ COPY /src/common/resources/images/$BG_IMG /usr/share/backgrounds/bg_default.png
### Install kasm_vnc dependencies and binaries ### Install kasm_vnc dependencies and binaries
COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/ COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/
RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/ RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/
COPY ./src/common/install/kasm_vnc/kasmvnc.yaml /etc/kasmvnc/
### Install Kasm Upload Server ### Install Kasm Upload Server
COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/ COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/

1
dockerfile-kasm-core-suse
View File

@ -85,6 +85,7 @@ COPY /src/common/resources/images/$BG_IMG /usr/share/backgrounds/bg_default.png
### Install kasm_vnc dependencies and binaries ### Install kasm_vnc dependencies and binaries
COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/ COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/
RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/ RUN bash $INST_SCRIPTS/kasm_vnc/install_kasm_vnc.sh && rm -rf $INST_SCRIPTS/kasm_vnc/
COPY ./src/common/install/kasm_vnc/kasmvnc.yaml /etc/kasmvnc/
### Install Kasm Upload Server ### Install Kasm Upload Server
COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/ COPY ./src/ubuntu/install/kasm_upload_server $INST_SCRIPTS/kasm_upload_server/

4
src/common/install/kasm_vnc/kasmvnc.yaml Normal file
View File

@ -0,0 +1,4 @@
network:
ssl:
pem_certificate: ${HOME}/.vnc/self.pem
pem_key: ${HOME}/.vnc/self.pem

5
src/common/startup_scripts/vnc_startup.sh
View File

@ -58,10 +58,11 @@ function start_kasmvnc (){
rm -rf $HOME/.vnc/*.pid rm -rf $HOME/.vnc/*.pid
VNCOPTIONS="$VNCOPTIONS -select-de manual"
if [[ "${BUILD_ARCH}" =~ ^aarch64$ ]] && [[ -f /lib/aarch64-linux-gnu/libgcc_s.so.1 ]] ; then if [[ "${BUILD_ARCH}" =~ ^aarch64$ ]] && [[ -f /lib/aarch64-linux-gnu/libgcc_s.so.1 ]] ; then
LD_PRELOAD=/lib/aarch64-linux-gnu/libgcc_s.so.1 vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -cert ${HOME}/.vnc/self.pem -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 -BlacklistThreshold=0 -FreeKeyMappings $VNCOPTIONS $KASM_SVC_SEND_CUT_TEXT $KASM_SVC_ACCEPT_CUT_TEXT LD_PRELOAD=/lib/aarch64-linux-gnu/libgcc_s.so.1 vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 -BlacklistThreshold=0 -FreeKeyMappings $VNCOPTIONS $KASM_SVC_SEND_CUT_TEXT $KASM_SVC_ACCEPT_CUT_TEXT
else else
vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -cert ${HOME}/.vnc/self.pem -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 -BlacklistThreshold=0 -FreeKeyMappings $VNCOPTIONS $KASM_SVC_SEND_CUT_TEXT $KASM_SVC_ACCEPT_CUT_TEXT vncserver $DISPLAY -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 -BlacklistThreshold=0 -FreeKeyMappings $VNCOPTIONS $KASM_SVC_SEND_CUT_TEXT $KASM_SVC_ACCEPT_CUT_TEXT
fi fi
KASM_PROCS['kasmvnc']=$(cat $HOME/.vnc/*${DISPLAY_NUM}.pid) KASM_PROCS['kasmvnc']=$(cat $HOME/.vnc/*${DISPLAY_NUM}.pid)

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

@ -8,13 +8,22 @@ install_libjpeg_turbo() {
rm "$libjpeg_deb" rm "$libjpeg_deb"
} }
prepare_rpm_repo_dependencies() {
if [[ "$DISTRO" = "oracle7" ]]; then
yum-config-manager --enable ol7_optional_latest
elif [[ "$DISTRO" = "oracle8" ]]; then
dnf config-manager --set-enabled ol8_codeready_builder
dnf install -y oracle-epel-release-el8
fi
}
echo "Install KasmVNC server" echo "Install KasmVNC server"
cd /tmp cd /tmp
BUILD_ARCH=$(uname -p) BUILD_ARCH=$(uname -p)
UBUNTU_CODENAME="" UBUNTU_CODENAME=""
COMMIT_ID="fdc4a63eda4b0bc77742cf1047434515fdf58d17" COMMIT_ID="0ef8a51945eb45520367f7e92f75085f0831e2f6"
BRANCH="release" # just use 'release' for a release branch BRANCH="master" # just use 'release' for a release branch
KASMVNC_VER="0.9.3.2" KASMVNC_VER="0.9.4"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
# Naming scheme is now different between an official release and feature branch # Naming scheme is now different between an official release and feature branch
@ -33,18 +42,18 @@ then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_kali-rolling_${KASM_VER_NAME_PART}_arm64.deb" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_kali-rolling_${KASM_VER_NAME_PART}_arm64.deb"
fi fi
elif [[ "${DISTRO}" == @(centos|oracle7) ]] ; then elif [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/centos_core/kasmvncserver-0.9.3~beta-1.el7.x86_64.rpm" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_centos_core_${KASM_VER_NAME_PART}_x86_64.rpm"
elif [[ "${DISTRO}" == "oracle8" ]] ; then elif [[ "${DISTRO}" == "oracle8" ]] ; then
if [[ "$(arch)" =~ ^x86_64$ ]] ; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/oracle_8/kasmvncserver-0.9.3~beta-1.el8.x86_64.rpm" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_oracle_8_${KASM_VER_NAME_PART}_x86_64.rpm"
else else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/oracle_8/kasmvncserver-0.9.3~beta-1.el8.aarch64.rpm" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_oracle_8_${KASM_VER_NAME_PART}_aarch64.rpm"
fi fi
elif [[ "${DISTRO}" == "opensuse" ]] ; then elif [[ "${DISTRO}" == "opensuse" ]] ; then
if [[ "$(arch)" =~ ^x86_64$ ]] ; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/opensuse_15/kasmvncserver-0.9.3~beta-leap15.x86_64.rpm" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_15_${KASM_VER_NAME_PART}_x86_64.rpm"
else else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/output/opensuse_15/kasmvncserver-0.9.3~beta-leap15.aarch64.rpm" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_opensuse_15_${KASM_VER_NAME_PART}_aarch64.rpm"
fi fi
else else
UBUNTU_CODENAME=$(grep -Po -m 1 "(?<=_CODENAME=)\w+" /etc/os-release) UBUNTU_CODENAME=$(grep -Po -m 1 "(?<=_CODENAME=)\w+" /etc/os-release)
@ -58,6 +67,7 @@ else
fi fi
prepare_rpm_repo_dependencies
if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
wget "${BUILD_URL}" -O kasmvncserver.rpm wget "${BUILD_URL}" -O kasmvncserver.rpm
yum localinstall -y kasmvncserver.rpm yum localinstall -y kasmvncserver.rpm
@ -68,26 +78,9 @@ elif [[ "${DISTRO}" == "oracle8" ]] ; then
rm kasmvncserver.rpm rm kasmvncserver.rpm
dnf clean all dnf clean all
elif [[ "${DISTRO}" == "opensuse" ]] ; then elif [[ "${DISTRO}" == "opensuse" ]] ; then
zypper -n install -y \
libglvnd \
libgnutls30 \
libgomp1 \
libjpeg8 \
libnettle6 \
libpixman-1-0 \
libXdmcp6 \
libXfont2-2 \
libxkbcommon-x11-0 \
openssl \
perl \
x11-tools \
xauth \
xkbcomp \
xkeyboard-config \
xrdb
mkdir -p /etc/pki/tls/private mkdir -p /etc/pki/tls/private
wget "${BUILD_URL}" -O kasmvncserver.rpm wget "${BUILD_URL}" -O kasmvncserver.rpm
rpm -i kasmvncserver.rpm zypper install -y --allow-unsigned-rpm ./kasmvncserver.rpm
rm kasmvncserver.rpm rm kasmvncserver.rpm
zypper clean --all zypper clean --all
else else