publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve KASM-6760 "Feature/ latest xorg"

Browse Source
This commit is contained in:
Ryan Kuba
2024-12-11 19:28:44 +00:00
committed by Matthew McClaskey
parent b3c93327d9
commit 586c33a454
15 changed files with 140 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builder/build.sh
View File

@@ -46,7 +46,11 @@ EOF
cd /tmp
# default to the version of x in Ubuntu 18.04, otherwise caller will need to specify
XORG_VER=${XORG_VER:-"1.19.6"}
XORG_PATCH=$(echo "$XORG_VER" | grep -Po '^\d.\d+' | sed 's#\.##')
if [[ "${XORG_VER}" == 21* ]]; then
XORG_PATCH=21
else
XORG_PATCH=$(echo "$XORG_VER" | grep -Po '^\d.\d+' | sed 's#\.##')
fi
wget --no-check-certificate https://www.x.org/archive/individual/xserver/xorg-server-${XORG_VER}.tar.gz
#git clone https://kasmweb@bitbucket.org/kasmtech/kasmvnc.git

2
builder/dockerfile.alpine_317.build
View File

@@ -2,7 +2,7 @@ FROM alpine:3.17
ENV KASMVNC_BUILD_OS alpine
ENV KASMVNC_BUILD_OS_CODENAME 317
ENV XORG_VER 1.20.14
ENV XORG_VER 21.1.8
RUN \
echo "**** install build deps ****" && \

2
builder/dockerfile.alpine_318.build
View File

@@ -2,7 +2,7 @@ FROM alpine:3.18
ENV KASMVNC_BUILD_OS alpine
ENV KASMVNC_BUILD_OS_CODENAME 318
ENV XORG_VER 1.20.14
ENV XORG_VER 21.1.10
RUN \
echo "**** install build deps ****" && \

2
builder/dockerfile.alpine_319.build
View File

@@ -2,7 +2,7 @@ FROM alpine:3.19
ENV KASMVNC_BUILD_OS alpine
ENV KASMVNC_BUILD_OS_CODENAME 319
ENV XORG_VER 1.20.14
ENV XORG_VER 21.1.12
RUN \
echo "**** install build deps ****" && \

2
builder/dockerfile.alpine_320.build
View File

@@ -2,7 +2,7 @@ FROM alpine:3.20
ENV KASMVNC_BUILD_OS alpine
ENV KASMVNC_BUILD_OS_CODENAME 320
ENV XORG_VER 1.20.14
ENV XORG_VER 21.1.14
RUN \
echo "**** install build deps ****" && \

2
builder/dockerfile.alpine_321.build
View File

@@ -2,7 +2,7 @@ FROM alpine:3.21
ENV KASMVNC_BUILD_OS alpine
ENV KASMVNC_BUILD_OS_CODENAME 321
ENV XORG_VER 1.20.14
ENV XORG_VER 21.1.14
RUN \
echo "**** install build deps ****" && \

2
builder/dockerfile.debian_bookworm.build
View File

@@ -2,7 +2,7 @@ FROM debian:bookworm-slim
ENV KASMVNC_BUILD_OS debian
ENV KASMVNC_BUILD_OS_CODENAME bookworm
ENV XORG_VER 1.20.10
ENV XORG_VER 21.1.7
ENV DEBIAN_FRONTEND noninteractive
RUN \

2
builder/dockerfile.kali_kali-rolling.build
View File

@@ -2,7 +2,7 @@ FROM kalilinux/kali-rolling:latest
ENV KASMVNC_BUILD_OS kali
ENV KASMVNC_BUILD_OS_CODENAME kali-rolling
ENV XORG_VER 1.20.10
ENV XORG_VER 21.1.14
ENV DEBIAN_FRONTEND noninteractive
RUN grep '^deb' /etc/apt/sources.list | sed 's#^deb#deb-src#' >> /etc/apt/sources.list

2
builder/dockerfile.oracle_8.build
View File

@@ -2,7 +2,7 @@ FROM oraclelinux:8
ENV KASMVNC_BUILD_OS oracle
ENV KASMVNC_BUILD_OS_CODENAME 8
ENV XORG_VER 1.20.10
ENV XORG_VER 1.20.11
# Install from stock repos
RUN \

2
builder/dockerfile.oracle_9.build
View File

@@ -2,7 +2,7 @@ FROM oraclelinux:9
ENV KASMVNC_BUILD_OS oracle
ENV KASMVNC_BUILD_OS_CODENAME 9
ENV XORG_VER 1.20.10
ENV XORG_VER 1.20.11
# Install from stock repos
RUN \

2
builder/dockerfile.ubuntu_jammy.build
View File

@@ -2,7 +2,7 @@ FROM ubuntu:jammy
ENV KASMVNC_BUILD_OS ubuntu
ENV KASMVNC_BUILD_OS_CODENAME jammy
ENV XORG_VER 1.20.8
ENV XORG_VER 21.1.3
ENV DEBIAN_FRONTEND noninteractive
RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list

2
builder/dockerfile.ubuntu_noble.build
View File

@@ -2,7 +2,7 @@ FROM ubuntu:noble
ENV KASMVNC_BUILD_OS ubuntu
ENV KASMVNC_BUILD_OS_CODENAME noble
ENV XORG_VER 1.20.8
ENV XORG_VER 21.1.12
ENV DEBIAN_FRONTEND noninteractive
RUN sed -i 's$Types: deb$Types: deb deb-src$' /etc/apt/sources.list.d/ubuntu.sources