Specs: improve spec runner

Specs: extract spec_helper.py
Specs: improve run-specs(1)
281 changed files with 1532 additions and 29278 deletions
--- a/.ci/upload.sh
+++ b/.ci/upload.sh
@ -3,28 +3,7 @@
 is_kasmvnc() {
  local package="$1";

-  echo "$package" | grep -qP 'kasmvncserver(_|-)[0-9]'
-}
-
-detect_deb_package_arch() {
-  local deb_package="$1"
-  echo "$deb_package" | sed -e 's/.\+_\([^.]\+\)\.\(d\?\)deb/\1/'
-}
-
-find_deb_package() {
-  local dbgsym_package="$1"
-
-  echo "$dbgsym_package" | sed -e 's/-dbgsym//; s/ddeb/deb/'
-}
-
-fetch_xvnc_md5sum() {
-  local deb_package="$1"
-  deb_package=$(realpath "$deb_package")
-
-  local tmpdir=$(mktemp -d)
-  cd "$tmpdir"
-  dpkg-deb -e "$deb_package"
-  cat DEBIAN/md5sums | grep bin/Xkasmvnc | cut -d' ' -f 1
+  echo "$package" | grep -q 'kasmvncserver_'
 }

 function prepare_upload_filename() {
@ -55,18 +34,19 @@ function prepare_upload_filename() {
 function upload_to_s3() {
  local package="$1";
  local upload_filename="$2";
-  local s3_bucket="$3";

  # Transfer to S3
-  python3 amazon-s3-bitbucket-pipelines-python/s3_upload.py "${s3_bucket}" "$package" "${upload_filename}";
+  python3 amazon-s3-bitbucket-pipelines-python/s3_upload.py "${S3_BUCKET}" "$package" "${S3_BUILD_DIRECTORY}/${upload_filename}";
  # Use the Gitlab API to tell Gitlab where the artifact was stored
-  export S3_URL="https://${s3_bucket}.s3.amazonaws.com/${upload_filename}";
+  export S3_URL="https://${S3_BUCKET}.s3.amazonaws.com/${S3_BUILD_DIRECTORY}/${upload_filename}";
+  export BUILD_STATUS="{\"key\":\"doc\", \"state\":\"SUCCESSFUL\", \"name\":\"${upload_filename}\", \"url\":\"${S3_URL}\"}";
+  curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=build-url&target_url=${S3_URL}";
 };

 function prepare_to_run_scripts_and_s3_uploads() {
  export DEBIAN_FRONTEND=noninteractive;
  apt-get update;
-  apt-get install -y ruby2.7 git wget;
+  apt-get install -y ruby2.7 git;
  apt-get install -y python3 python3-pip python3-boto3 curl pkg-config libxmlsec1-dev;
  git clone https://bitbucket.org/awslabs/amazon-s3-bitbucket-pipelines-python.git;
 };
@ -89,26 +69,3 @@ detect_revision() {

  REVISION=$(echo "$package" | sed "s/_${arch}.\+//" | sed 's/.\++//')
 }
-
-make_index_html() {
-  local body=""
-  local bname
-
-  for f in "$@"; do
-    bname=$(basename "$f")
-    body="${body}<a href=/$f>$bname</a><br>"
-  done
-
-  cat <<EOF
-<!doctype html>
-<html lang=en>
-<head>
-	<meta charset=utf-8>
-	<title>KasmVNC preview build</title>
-</head>
-<body>
-$body
-</body>
-</html>
-EOF
-}
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/installation-issue.md
+++ b/.github/ISSUE_TEMPLATE/installation-issue.md
@ -1,27 +0,0 @@
---
-name: Installation Issue
-about: Create a report about an installation issue
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the issue is.
-
-**System Description**
-Provide the output of 
-```bash
-cat /etc/os-release
-uname -a
-```
-
-**KasmVNC Details**
-Provide the filename of the package you installed KasmVNC with. The filename includes important details like the OS, architecture, and commit sha.
-
-**Installation Details**
-Provide the commands used to install the KasmVNC package and the output of those commands.
-
-**Additional context**
-Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/report-a-bug-or-issue-with-kasmvnc.md
+++ b/.github/ISSUE_TEMPLATE/report-a-bug-or-issue-with-kasmvnc.md
@ -1,46 +0,0 @@
---
-name: Report a bug or issue with KasmVNC
-about: Create a bug/issue report on KasmVNC
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the issue is.
-
-**System Description**
-Provide the output of 
-```bash
-cat /etc/os-release
-uname -a
-```
-
-**KasmVNC Details**
-Provide the filename of the package you installed KasmVNC with. The filename includes important details like the OS, architecture, and commit sha.
-
-Provide the output of this command.
-```bash
-Xvnc -version
-```
-
-**To Reproduce**
-Steps to reproduce the behavior (for non-installation issues):
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Browser**
-If this is a problem with the KasmVNC client, provide details about the browser you are accessing KasmVNC from.
- - Device: [e.g. iPhone6]
- - OS: [e.g. Windows 11]
- - Browser [e.g. chrome, safari, edge]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
--- a/.gitignore
+++ b/.gitignore
@ -14,7 +14,6 @@ config.h

 builder/build/
 builder/www/
-spec/tmp

 # Deb building artefacts
 debian/.debhelper/
@ -22,4 +21,3 @@ debian/files
 debian/kasmvncserver.substvars
 debian/kasmvncserver/
 .pc
-.vscode/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -3,26 +3,13 @@ services:
  - docker:dind

 variables:
-  KASMVNC_COMMIT_ID: $CI_COMMIT_SHA
  GITLAB_SHARED_DIND_DIR: /builds/$CI_PROJECT_PATH/shared
  GIT_SUBMODULE_STRATEGY: normal
-  GIT_FETCH_EXTRA_FLAGS: --tags --force
-  # E.g. BUILD_JOBS: build_debian_buster,build_ubuntu_bionic. This will include
-  # arm builds, because build_debian_buster_arm matches build_debian_buster.
-  # "BUILD_JOBS: none" won't build any build jobs, nor www.
-  BUILD_JOBS: all
-  DOCKER_HOST: tcp://docker:2375
-  DOCKER_TLS_CERTDIR: ""
-
-workflow:
-  rules:
-    # Disable tag builds.
-    - if: $CI_COMMIT_TAG != $CI_COMMIT_REF_NAME && $CI_PIPELINE_SOURCE != "merge_request_event"
+  GIT_FETCH_EXTRA_FLAGS: --tags

 stages:
  - www
  - build
-  - test
  - upload

 .prepare_build: &prepare_build
@ -37,15 +24,9 @@ stages:
  - cp -r builder/build/* output/
  - rm output/*.tar.gz

-default:
-  tags:
-    - oci-fixed-amd
-
 build_www:
  stage: www
  allow_failure: false
-  tags:
-    - oci-fixed-amd
  before_script:
    - *prepare_build
  script:
@ -55,13 +36,7 @@ build_www:
    - docker run --rm -v $PWD/builder/www:/build kasmweb/www:latest
    - mkdir -p output/www
    - cd builder
-    - echo $PWD
-    - ls -l
-    - ls -l ../output
    - tar -zcvf ../output/www/kasm_www.tar.gz www
-  only:
-    variables:
-      - $BUILD_JOBS !~ /^none$/
  artifacts:
    paths:
      - output/
@ -69,8 +44,6 @@ build_www:
 build_ubuntu_bionic:
  stage: build
  allow_failure: true
-  tags:
-    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@ -78,9 +51,6 @@ build_ubuntu_bionic:
    - *prepare_artfacts
  script:
    - bash builder/build-package ubuntu bionic
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/
@ -89,7 +59,7 @@ build_ubuntu_bionic_arm:
  stage: build
  allow_failure: false
  tags:
-    - oci-fixed-arm
+    - arm
  before_script:
    - *prepare_build
    - *prepare_www
@ -97,37 +67,27 @@ build_ubuntu_bionic_arm:
    - *prepare_artfacts
  script:
    - bash builder/build-package ubuntu bionic
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

-build_ubuntu_focal:
+build_ubuntu_bionic_libjpeg_turbo:
  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
+  allow_failure: false
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
-    - bash builder/build-package ubuntu focal;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+    - bash builder/build-package ubuntu bionic +libjpeg-turbo_latest
  artifacts:
    paths:
      - output/

-build_ubuntu_focal_arm:
+build_ubuntu_focal:
  stage: build
  allow_failure: true
-  tags:
-    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@ -137,83 +97,26 @@ build_ubuntu_focal_arm:
    - bash builder/build-package ubuntu focal;
  only:
    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_ubuntu_jammy:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package ubuntu jammy;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_ubuntu_jammy_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package ubuntu jammy;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_ubuntu_noble:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package ubuntu noble;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
  artifacts:
    paths:
      - output/

-build_ubuntu_noble_arm:
+build_ubuntu_focal_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm
+    - arm
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
-    - bash builder/build-package ubuntu noble;
+    - bash builder/build-package ubuntu focal;
  only:
    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
  artifacts:
    paths:
      - output/
@ -221,8 +124,6 @@ build_ubuntu_noble_arm:
 build_debian_buster:
  stage: build
  allow_failure: true
-  tags:
-    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@ -232,7 +133,7 @@ build_debian_buster:
    - bash builder/build-package debian buster;
  only:
    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/
  artifacts:
    paths:
      - output/
@ -241,7 +142,7 @@ build_debian_buster_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm
+    - arm
  before_script:
    - *prepare_build
    - *prepare_www
@ -251,7 +152,7 @@ build_debian_buster_arm:
    - bash builder/build-package debian buster;
  only:
    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/
  artifacts:
    paths:
      - output/
@ -259,8 +160,6 @@ build_debian_buster_arm:
 build_debian_bullseye:
  stage: build
  allow_failure: true
-  tags:
-    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
@ -270,7 +169,7 @@ build_debian_bullseye:
    - bash builder/build-package debian bullseye;
  only:
    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/
  artifacts:
    paths:
      - output/
@ -279,7 +178,7 @@ build_debian_bullseye_arm:
  stage: build
  allow_failure: true
  tags:
-    - oci-fixed-arm
+    - arm
  before_script:
    - *prepare_build
    - *prepare_www
@ -289,46 +188,7 @@ build_debian_bullseye_arm:
    - bash builder/build-package debian bullseye;
  only:
    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-
-build_debian_bookworm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package debian bookworm;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_debian_bookworm_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package debian bookworm;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/
  artifacts:
    paths:
      - output/
@ -336,27 +196,6 @@ build_debian_bookworm_arm:
 build_kali_rolling:
  stage: build
  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package kali kali-rolling;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_kali_rolling_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
  before_script:
    - *prepare_build
    - *prepare_www
@ -364,569 +203,38 @@ build_kali_rolling_arm:
    - *prepare_artfacts
  script:
    - bash builder/build-package kali kali-rolling;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_oracle_8:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 8;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_oracle_8_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 8;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_oracle_9:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 9;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_oracle_9_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package oracle 9;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_opensuse_15:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package opensuse 15;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_opensuse_15_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package opensuse 15;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_thirtyseven:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtyseven;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_thirtyseven_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtyseven;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
  artifacts:
    paths:
      - output/

-build_fedora_thirtyeight:
+build_centos7:
  stage: build
  allow_failure: true
-  tags:
-    - oci-fixed-amd
  before_script:
    - *prepare_build
    - *prepare_www
  after_script:
    - *prepare_artfacts
  script:
-    - bash builder/build-package fedora thirtyeight;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
+    - bash builder/build-package centos core
  artifacts:
    paths:
      - output/

-build_fedora_thirtyeight_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
+upload:
+  stage: upload
+  image: ubuntu:focal
  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
+    - . .ci/upload.sh
  script:
-    - bash builder/build-package fedora thirtyeight;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_thirtynine:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtynine;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_thirtynine_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora thirtynine;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_forty:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora forty;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-    
-build_fedora_forty_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script: 
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora forty;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_fedora_fortyone:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package fedora fortyone;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-    
-build_fedora_fortyone_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script: 
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script: 
-    - bash builder/build-package fedora fortyone;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_317:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 317;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_317_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 317;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-test:
-  stage: test
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-  script:
-    - bash builder/test-vncserver
-
-
-build_alpine_318:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 318;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_318_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 318;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_319:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 319;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_319_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 319;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_320:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 320;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_320_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 320;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_321:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 321;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-build_alpine_321_arm:
-  stage: build
-  allow_failure: true
-  tags:
-    - oci-fixed-arm
-  before_script:
-    - *prepare_build
-    - *prepare_www
-  after_script:
-    - *prepare_artfacts
-  script:
-    - bash builder/build-package alpine 321;
-  only:
-    variables:
-      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
-  artifacts:
-    paths:
-      - output/
-
-upload:
-  stage: upload
-  image: ubuntu:focal
-  tags:
-    - oci-fixed-amd
-  artifacts:
-    paths:
-      - output/
-  before_script:
-    - . .ci/upload.sh
-  script:
-    - prepare_to_run_scripts_and_s3_uploads
-    - S3_CRASHPAD_BUILD_DIRECTORY="kasmvnc/crashpad/${CI_COMMIT_SHA}"
-    - for dbgsym_package in `find output/ -type f -name '*dbgsym*deb'`; do
-        deb_package=$(find_deb_package "$dbgsym_package");
-        xvnc_md5sum=$(fetch_xvnc_md5sum "$deb_package");
-        upload_filename="${S3_CRASHPAD_BUILD_DIRECTORY}/${xvnc_md5sum}/kasmvncserver-dbgsym.deb";
-        echo;
-        echo "File to upload $upload_filename";
-        upload_to_s3 "$dbgsym_package" "$upload_filename" "$S3_BUCKET";
-        rm "$dbgsym_package";
-      done
    - export S3_BUILD_DIRECTORY="kasmvnc/${CI_COMMIT_SHA}"
+    - prepare_to_run_scripts_and_s3_uploads
    - export RELEASE_VERSION=$(.ci/next_release_version "$CI_COMMIT_REF_NAME")
-    - uploaded_files=()
-    - for package in `find output/ -type f -name '*.deb' -or -name '*.rpm' -or -name '*.tgz'`; do
+    - for package in `find output/ -type f -name '*.deb' -or -name '*.rpm'`; do
        prepare_upload_filename "$package";
-        upload_filename="${S3_BUILD_DIRECTORY}/$upload_filename";
        echo;
        echo "File to upload $upload_filename";
-        upload_to_s3 "$package" "$upload_filename" "$S3_BUCKET";
-        UPLOAD_NAME=$(basename $upload_filename | sed 's#kasmvncserver_##' | sed -r 's#_([0-9]{1,3}\.){2}[0-9]{1,2}_\S+?([a-f0-9]{6})##' | sed -r 's#\.(deb|rpm|tgz)##');
+        upload_to_s3 "$package" "$upload_filename";
+        UPLOAD_NAME=$(echo $upload_filename | sed 's#kasmvncserver_##' | sed -r 's#_([0-9]{1,3}\.){2}[0-9]{1,2}_\S+?([a-f0-9]{6})##' | sed -r 's#\.(deb|rpm)##');
        curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=${UPLOAD_NAME}&target_url=${S3_URL}";
-        uploaded_files+=("$upload_filename");
      done
-    - make_index_html "${uploaded_files[@]}" > output/index.html;
-
-upload_build_preview:
-  stage: upload
-  needs: ["upload"]
-  dependencies: ["upload"]
-  image: ubuntu:focal
-  tags:
-    - oci-fixed-amd
-  before_script:
-    - . .ci/upload.sh
-  resource_group: upload_build_preview
-  only:
-    variables:
-      - $CI_COMMIT_BRANCH == 'master'
-  script:
-    - prepare_to_run_scripts_and_s3_uploads
-    - preview_builds_dir=kasmvnc/preview-builds
-    - upload_to_s3 "output/index.html" "$preview_builds_dir/index.html" "$S3_BUCKET"
-    - curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=success&name=index.html&target_url=${S3_URL}";
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = release/1.2.2
+	branch = master
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -79,9 +79,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")

-# Enable C++ 11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-
 # Tell the compiler to be stringent
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat=2")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wformat=2")
@ -148,17 +145,9 @@ endif()
 # Check for zlib
 find_package(ZLIB REQUIRED)

-# Check for libpng
-find_package(PNG REQUIRED)
-
 # Check for libjpeg
 find_package(JPEG REQUIRED)

-find_package(Freetype REQUIRED)
-include_directories(${FREETYPE_INCLUDE_DIRS})
-
-# Staticly link libjpeg-turbo
-set(JPEG_LIBRARIES "-Wl,-Bstatic -lturbojpeg -Wl,-Bdynamic")
 # Warn if it doesn't seem to be the accelerated libjpeg that's found
 set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})
 set(CMAKE_REQUIRED_FLAGS -I${JPEG_INCLUDE_DIR})
--- a/DEBUGGING.md
+++ b/DEBUGGING.md
@ -1,108 +0,0 @@
-# Debugging
-In the case where KasmVNC crashes and a backtrace is produced. Developers need a way to make the backtrace useful for debugging. This document covers where the backtrace is logged and how to use a debug symbol package and gdb to gain more information from the backtrace, such as filename, function name, and line number.
-
-## Test Symbolization
-If you want to induce a crash to test that you can symbolize a backtrace you can start KasmVNC and then issue the following command.
-
-    killall -SEGV Xvnc
-
-This will cause KasmVNC to terminate with a backtrace similar to the following. You will find the backtrace in the log file at $HOME/.vnc/$HOSTNAME:$DISPLAY.log where HOME is your user's profile path, HOSTNAME is the hostname of the system, and DISPLAY is the assigned display number for the session.
-
-    (EE) 
-    (EE) Backtrace:
-    (EE) 0: /usr/bin/Xvnc (xorg_backtrace+0x4d) [0x5e48dd]
-    (EE) 1: /usr/bin/Xvnc (0x400000+0x1e8259) [0x5e8259]
-    (EE) 2: /lib/x86_64-linux-gnu/libpthread.so.0 (0x7f5a57ef6000+0x12980) [0x7f5a57f08980]
-    (EE) 3: /lib/x86_64-linux-gnu/libc.so.6 (epoll_wait+0x57) [0x7f5a552eca47]
-    (EE) 4: /usr/bin/Xvnc (ospoll_wait+0x37) [0x5e8d07]
-    (EE) 5: /usr/bin/Xvnc (WaitForSomething+0x1c3) [0x5e2813]
-    (EE) 6: /usr/bin/Xvnc (Dispatch+0xa7) [0x597007]
-    (EE) 7: /usr/bin/Xvnc (dix_main+0x36e) [0x59b1fe]
-    (EE) 8: /lib/x86_64-linux-gnu/libc.so.6 (__libc_start_main+0xe7) [0x7f5a551ecbf7]
-    (EE) 9: /usr/bin/Xvnc (_start+0x2a) [0x46048a]
-    (EE) 
-    (EE) Received signal 11 sent by process 17182, uid 0
-    (EE) 
-    Fatal server error:
-    (EE) Caught signal 11 (Segmentation fault). Server aborting
-    (EE) 
-
-## Debug Symbol Package
-In order to make use of this backtrace, you will need to symbolize the backtrace. Each build of KasmVNC produced by our pipelines comes with a corresponding debug symbol package that can be downloaded. You need two pieces of information to get the package, the git commit ID of KasmVNC and the MD5 sum of Xkasmvnc binary on your system. 
-
-The git commit ID can be found using Xvnc -version:
-
-    ubuntu@matt-dev-vm-1:~$ Xvnc -version
-    Xvnc KasmVNC 0.9.94002f39917dca0ad82ac0c29a75c723b538b32b - built Feb 17 2022 15:21:01
-    Copyright (C) 1999-2018 KasmVNC Team and many others (see README.me)
-    See http://kasmweb.com for information on KasmVNC.
-    Underlying X server release 12010000, The X.Org Foundation
-
-The MD5 sum can be obtained using the md5sum command:
-
-    md5sum /usr/bin/Xkasmvnc
-    57ee7028239c5a737c0aeee4a34138c3  /usr/bin/Xkasmvnc
-    
-With these two pieces of information, you can get the debug symbol package at https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/[COMMITID]/[MD5SUM]/kasmvncserver-dbgsym.deb, in the above example it would be.
-
-[https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb](https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb "https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb")
-
-Use wget or curl to download the debug symbol package and then install it.
-
-    wget  https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/crashpad/94002f39917dca0ad82ac0c29a75c723b538b32b/57ee7028239c5a737c0aeee4a34138c3/kasmvncserver-dbgsym.deb
-    sudo dpkg -i kasmvncserver-dbgsym.deb
-
-## Symbolize a Backtrace
-With the KasmVNC binary and debug symbol package installed on the system, you can use gdb or addr2line to get more information, such as the filename, function name, and line number that the backtrace line is referring to. 
-
-Here is a single line from a backtrace. The following example shows how to retrieve additional information that can help with debugging the crash.
-(EE) 8: /usr/bin/Xvnc (0x400000+0x13e674) [**0x53e674**]
-
-    echo info line ***0x53eaaa** | gdb -q /usr/bin/Xkasmvnc
-    (gdb) Line 223 of "/src/common/network/webudp/Wu.cpp" starts at address 0x53e674 <WuClientSendPendingDTLS(WuClient*, Wu const*, Wu const*)+68>
-
-The following script will search the provide file for a backtrace and symbolize the entire backtrace.
-
-    #!/bin/bash
-      
-    FILENAME=$1
-    grep "(EE)" $FILENAME | while read -r line ; do
-            BACKTRACE=$(echo $line | grep -Po '\[[0-9a-f]x[a-f0-9]{1,}' | sed -r 's#\[##')
-            echo $line
-            if ! [ -z $BACKTRACE ] ; then
-                    SYMBOLIZED=$(echo "info line *${BACKTRACE}" | gdb /usr/bin/Xkasmvnc | grep "(gdb)" | grep -vP "\(gdb\)\s*quit$")
-                    echo "    ${SYMBOLIZED}"
-            fi
-    done
-
-Using this script on the above example backtrace produces the following output.
-
-    ubuntu@hostname-1:~$ bash symbolize.sh ~/.vnc/hostname-1\:10.log
-    (EE)
-    (EE) Backtrace:
-    (EE) 0: /usr/bin/Xvnc (xorg_backtrace+0x4d) [0x5e48dd]
-        (gdb) Line 130 of "backtrace.c" starts at address 0x5e48dd <xorg_backtrace+77> and ends at 0x5e4900 <xorg_backtrace+112>.
-    (EE) 1: /usr/bin/Xvnc (0x400000+0x1e8259) [0x5e8259]
-        (gdb) Line 138 of "osinit.c" starts at address 0x5e8259 <OsSigHandler+41> and ends at 0x5e8275 <OsSigHandler+69>.
-    (EE) 2: /lib/x86_64-linux-gnu/libpthread.so.0 (0x7f5a57ef6000+0x12980) [0x7f5a57f08980]
-        (gdb) No line number information available for address 0x7f5a57f08980
-    (EE) 3: /lib/x86_64-linux-gnu/libc.so.6 (epoll_wait+0x57) [0x7f5a552eca47]
-        (gdb) No line number information available for address 0x7f5a552eca47
-    (EE) 4: /usr/bin/Xvnc (ospoll_wait+0x37) [0x5e8d07]
-        (gdb) Line 643 of "ospoll.c" starts at address 0x5e8d07 <ospoll_wait+55> and ends at 0x5e8d09 <ospoll_wait+57>.
-    (EE) 5: /usr/bin/Xvnc (WaitForSomething+0x1c3) [0x5e2813]
-        (gdb) Line 210 of "WaitFor.c" starts at address 0x5e2813 <WaitForSomething+451> and ends at 0x5e2819 <WaitForSomething+457>.
-    (EE) 6: /usr/bin/Xvnc (Dispatch+0xa7) [0x597007]
-        (gdb) Line 421 of "dispatch.c" starts at address 0x596ffb <Dispatch+155> and ends at 0x59700b <Dispatch+171>.
-    (EE) 7: /usr/bin/Xvnc (dix_main+0x36e) [0x59b1fe]
-        (gdb) Line 278 of "main.c" starts at address 0x59b1fe <dix_main+878> and ends at 0x59b203 <dix_main+883>.
-    (EE) 8: /lib/x86_64-linux-gnu/libc.so.6 (__libc_start_main+0xe7) [0x7f5a551ecbf7]
-        (gdb) No line number information available for address 0x7f5a551ecbf7
-    (EE) 9: /usr/bin/Xvnc (_start+0x2a) [0x46048a]
-        (gdb) No line number information available for address 0x46048a <_start+42>
-    (EE)
-    (EE) Received signal 11 sent by process 17182, uid 0
-    (EE)
-    (EE) Caught signal 11 (Segmentation fault). Server aborting
-    (EE)
-
--- a/README.md
+++ b/README.md
@ -2,245 +2,20 @@

 <a href="https://kasmweb.com"><img src="https://kasm-static-content.s3.amazonaws.com/logo_kasm.png" width="300"><a/>
  
-KasmVNC provides remote web-based access to a Desktop or application. While VNC is in the name, KasmVNC differs from other VNC variants such as TigerVNC, RealVNC, and TurboVNC. KasmVNC has broken from the RFB specification which defines VNC, in order to support modern technologies and increase security. KasmVNC is accessed by users from any modern browser and does not support legacy VNC viewer applications. KasmVNC uses a modern YAML based configuration at the server and user level, allowing for ease of management.
-
-[Kasm Technologies](https://www.kasmweb.com) developed Kasm Workspaces, the Containerized Streaming Platform. Kasm has open-sourced the Workspace docker images, which include containerized [full desktops and apps](https://github.com/kasmtech/workspaces-images) and [base images](https://github.com/kasmtech/workspaces-core-images) intended for developers to create customized streaming containers. These containers can be used standalone or within the [Kasm Workspaces Platform](https://www.kasmweb.com) which provides a full Enterprise feature set.
-
-## Documentation
-
-**Do not use the README from the master branch**, unless you are compiling KasmVNC yourself from the tip of master. Use the documentation for your specific release.
-
-  - [KasmVNC 1.0.0 Documentation](https://www.kasmweb.com/kasmvnc/docs/1.0.0/index.html)
-
-  For beta releases prior to version 1.0.0, use the README in this github project on the tagged commit for that release.
-
-## Installation
-
-**You must disconnect and reconnect to the server after installation, for the group membership to apply.**
-
-### Debian/Ubuntu/Kali
-```sh
-# Please choose the package for your distro here (under Assets):
-# https://github.com/kasmtech/KasmVNC/releases
-wget <package_url>
-
-sudo apt-get install ./kasmvncserver_*.deb
-
-# Add your user to the ssl-cert group
-sudo adduser $USER ssl-cert
-```
-
-### Oracle 8
-```sh
-# Please choose the package for your distro here (under Assets):
-# https://github.com/kasmtech/KasmVNC/releases
-wget <package_url>
-
-# Ensure KasmVNC dependencies are available
-sudo dnf config-manager --set-enabled ol8_codeready_builder
-sudo dnf install oracle-epel-release-el8
-
-sudo dnf localinstall ./kasmvncserver_*.rpm
-
-# Add your user to the kasmvnc-cert group
-sudo usermod -a -G kasmvnc-cert $USER
-```
-
-### CentOS 7
-
-```sh
-# Please choose the package for your distro here (under Assets):
-# https://github.com/kasmtech/KasmVNC/releases
-wget <package_url>
-
-# Ensure KasmVNC dependencies are available
-sudo yum install epel-release
-
-sudo yum install ./kasmvncserver_*.rpm
-
-# Add your user to the kasmvnc-cert group
-sudo usermod -a -G kasmvnc-cert $USER
-```
-
-## Getting Started
-
-The following examples provide basic usage of KasmVNC with the tools provided. For full documentation on all the utilities and the runtime environment, see our [KasmVNC Documentation](https://www.kasmweb.com/kasmvnc/docs/latest/index.html)
-
-```sh
-# Start a session and be guided to setup a user and select a default desktop environment
-vncserver
-
-# Start a session with the mate desktop environment
-vncserver -select-de mate
-
-# Add a new user with read/write permissions
-vncpasswd -u my_username -w -r
-
-# Tail the logs
-tail -f ~/.vnc/*.log
-
-# Get a list of current sessions with display IDs
-vncserver -list
-
-# Kill the VNC session with display ID :2
-vncserver -kill :2
-```
-
-## Configuration
-
-KasmVNC is configured via YAML based configurations. The server level configuration is at `/etc/kasmvnc/kasmvnc.yaml`. Edits to this file apply to all users. Individual users can override server global configurations by specifying them in their configuration file at `~/.vnc/kasmvnc.yaml`.
-
-The following configuration shows all default settings. Many of the encoding settings can be overridden by the client, unless the `runtime_configuration.allow_client_to_override_kasm_server_settings` setting is set tot false. By default the client is allowed to modify encoding settings.
-
-For a full description of each setting see the [configuration reference](https://www.kasmweb.com/kasmvnc/docs/latest/configuration.html).
-
-```yaml
-desktop:
-  resolution:
-    width: 1024
-    height: 768
-  allow_resize: true
-  pixel_depth: 24
-  gpu:
-    hw3d: false
-    drinode: /dev/dri/renderD128
-
-network:
-  protocol: http
-  interface: 0.0.0.0
-  websocket_port: auto
-  use_ipv4: true
-  use_ipv6: true
-  udp:
-    public_ip: auto
-    port: auto
-    stun_server: auto
-  ssl:
-    pem_certificate: /etc/ssl/certs/ssl-cert-snakeoil.pem
-    pem_key: /etc/ssl/private/ssl-cert-snakeoil.key
-    require_ssl: true
-
-user_session:
-  new_session_disconnects_existing_exclusive_session: false
-  concurrent_connections_prompt: false
-  concurrent_connections_prompt_timeout: 10
-  idle_timeout: never
-
-keyboard:
-  remap_keys:
-  ignore_numlock: false
-  raw_keyboard: false
-
-pointer:
-  enabled: true
-
-runtime_configuration:
-  allow_client_to_override_kasm_server_settings: true
-  allow_override_standard_vnc_server_settings: true
-  allow_override_list:
-    - pointer.enabled
-    - data_loss_prevention.clipboard.server_to_client.enabled
-    - data_loss_prevention.clipboard.client_to_server.enabled
-    - data_loss_prevention.clipboard.server_to_client.primary_clipboard_enabled
-
-logging:
-  log_writer_name: all
-  log_dest: logfile
-  level: 30
-
-security:
-  brute_force_protection:
-    blacklist_threshold: 5
-    blacklist_timeout: 10
-
-data_loss_prevention:
-  visible_region:
-    # top: 10
-    # left: 10
-    # right: 40
-    # bottom: 40
-    concealed_region:
-      allow_click_down: false
-      allow_click_release: false
-  clipboard:
-    delay_between_operations: none
-    allow_mimetypes:
-      - chromium/x-web-custom-data
-      - text/html
-      - image/png
-    server_to_client:
-      enabled: true
-      size: unlimited
-      primary_clipboard_enabled: false
-    client_to_server:
-      enabled: true
-      size: unlimited
-  keyboard:
-    enabled: true
-    rate_limit: unlimited
-  logging:
-    level: off
-
-encoding:
-  max_frame_rate: 60
-  full_frame_updates: none
-  rect_encoding_mode:
-    min_quality: 7
-    max_quality: 8
-    consider_lossless_quality: 10
-    rectangle_compress_threads: auto
-
-  video_encoding_mode:
-    jpeg_quality: -1
-    webp_quality: -1
-    max_resolution:
-      width: 1920
-      height: 1080
-    enter_video_encoding_mode:
-      time_threshold: 5
-      area_threshold: 45%
-    exit_video_encoding_mode:
-      time_threshold: 3
-    logging:
-      level: off
-    scaling_algorithm: progressive_bilinear
-
-  compare_framebuffer: auto
-  zrle_zlib_level: auto
-  hextile_improved_compression: true
-
-server:
-  http:
-    headers:
-      - Cross-Origin-Embedder-Policy=require-corp
-      - Cross-Origin-Opener-Policy=same-origin
-    httpd_directory: /usr/share/kasmvnc/www
-  advanced:
-    x_font_path: auto
-    kasm_password_file: ${HOME}/.kasmpasswd
-    x_authority_file: auto
-  auto_shutdown:
-    no_user_session_timeout: never
-    active_user_session_timeout: never
-    inactive_user_session_timeout: never
-
-command_line:
-  prompt: true
-```
+[Kasm Technologies](https://www.kasmweb.com) developed Kasm Workspaces, the Containerized Streaming Platform. Kasm has open-sourced the Workspace docker images, which include containerized [full desktops and apps](https://github.com/kasmtech/workspaces-images) and [base images](https://github.com/kasmtech/workspaces-core-images) intended for developers to create custimized streaming containers. These containers can be used standalone or within the [Kasm Workspaces Platform](https://www.kasmweb.com) which provides a full Enterprise feature set. KasmVNC is used as the streaming tech for our container images, however, you can use KasmVNC for individual servers. While the term VNC is in the name, KasmVNC is not intended to remain compliant with the RFB spec and has different goals than other VNC projects:

+  - Web-based - KasmVNC is designed to provide a web accessible remote desktop. It comes with a web server and websocket server built in. There is no need to install other components. Simply run and navigate to your desktop's URL on the port you specify. While you can still tun on the legacy VNC port, it is disabled by default.
+  - Security - The RFB specification (VNC) limits the password field to 8 characters, so while the client may take a longer password, only the first 8 characters are sent. KasmVNC defaults to HTTPS with HTTP Basic Auth and disables the legacy VNC authentication method which is not sufficiently secure for internet accessible systems.
+  - Simplicity - KasmVNC aims at being simple to deploy and configure.

 # New Features!

-  - Faster jpeg compression (via statically linked libjpeg-turbo)
  - Webp image compression for better bandwidth usage
  - Automatic mixing of webp and jpeg based on CPU availability on server
  - Multi-threaded image encoding for smoother frame rate for servers with more cores
-  - WebRTC UDP Transit
-  - Lossless QOI Image format for Local LAN
  - [Full screen video detection](https://github.com/kasmtech/KasmVNC/wiki/Video-Rendering-Options#video-mode), goes into configurable video mode for better full screen videoo playback performance.
  - [Dynamic jpeg/webp image coompression](https://github.com/kasmtech/KasmVNC/wiki/Video-Rendering-Options#dynamic-image-quality) quality settings based on screen change rates
  - Seemless clipboard support (on Chromium based browsers)
-  - Binary clipboard support for text, images, and formatted text (on Chromium based browsers)
  - Allow client to set/change most configuration settings
  - [Data Loss Prevention features](https://github.com/kasmtech/KasmVNC/wiki/Data-Loss-Prevention)
    - Key stroke logging
@ -250,23 +25,82 @@ command_line:
    - Keyboard input rate limit
    - Screen region selection
  - Deb packages for Debian, Ubuntu, and Kali Linux included in release.
-  - RPM packages for CentOS, Oracle, OpenSUSE, Fedora. RPM packages are currently not updatable and not released, though you can build and install them. See build documentation.
+  - RPM packages for CentOS, Fedora. RPM packages are currently not updatable and not released, though you can build and install them. See build documentation.
  - Web [API](https://github.com/kasmtech/KasmVNC/wiki/API) added for remotely controlling and getting information from KasmVNC
-  - Multi-User support with permissions that can be changed via the API
+  - Multi-User with ability to pass control to other users.
  - Web UI uses a webpack for faster load times.
  - Network and CPU bottleneck statistics
-  - Relative cursor support (game pointer mode)
-  - Cursor lock
-  - IME support for languages with extended characters
-  - Better mobile support
-  - DRI3 GPU acceleration with open source drivers (AMDGPU,Intel,ATI,ARM)
+

 Future Goals:

-  - H264 encoding
+  - Support uploads and downloads
+  - Pre-build Packages for all major Linux distributions
+
+### Installation
+
+#### Debian-based
+
+```sh
+wget https://github.com/kasmtech/KasmVNC/releases/download/v0.9.2-beta/kasmvncserver_ubuntu_bionic_0.9.2_amd64.deb
+
+sudo apt-get install ./kasmvncserver_0.9.1~beta-1_amd64.deb
+
+# Add your user to the ssl-cert group
+sudo addgroup $USER ssl-cert
+# You will need to re-connect in order to pick up the group change
+
+# Run KasmVNC on display :10 and on interface 0.0.0.0:
+KASMVNC_OPTIONS=':10 -depth 24 -geometry 1280x1050
+  -cert /etc/ssl/certs/ssl-cert-snakeoil.pem
+  -key /etc/ssl/private/ssl-cert-snakeoil.key -sslOnly -FrameRate=24
+  -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www'
+vncserver $KASMVNC_OPTIONS
+
+# On the first run, vncserver will ask you to create a KasmVNC user and choose a desktop
+# environment you want to run. It can detect Cinnamon, Mate, LXDE, KDE, Gnome,
+# XFCE. You can also choose to manually edit xstartup.
+# After you chose a desktop environment or to manually edit xstartup,
+# vncserver won't ask you again, unless you run it as:
+vncserver $KASMVNC_OPTIONS -select-de
+
+# You can select a specific Desktop Environment like this:
+vncserver $KASMVNC_OPTIONS -select-de mate
+
+# Tail the logs
+tail -f ~/.vnc/`hostname`:10.log
+```
+
+Now navigate to your system at https://[ip-address]:8443/
+
+To stop the KasmVNC you started earlier on display 10:
+
+```sh
+vncserver -kill :10
+```
+
+The options for vncserver:
+
+| Argument | Description |
+| -------- | ----------- |
+| depth | Color depth, for jpeg/webp should be 24bit |
+| geometry | Screensize, this will automatically be adjusted when the client connects. |
+| websocketPort | The port to use for the web socket. Use a high port to avoid having to run as root. |
+| cert | SSL cert to use for HTTPS |
+| sslOnly | Disable HTTP |
+| interface | Which interface to bind the web server to. |
+
+### Development
+Would you like to contribute to KasmVNC? Please reachout to us at info@kasmweb.com. We have investigated or are working on the following, if you have experience in these fields and would like to help please let us know.
+
+Real-time H264 encoding using NVIDIA and Intel encoding technology.
+
+Windows version of KasmVNC. We have been able to get it to compile for Windows and increased the performance, but still not releasable. Experienced Windows developers with a background in cross compiling would help.
+  
+ARM version of KasmVNC, we have had requests for this and at one point we did have an ARM build of KasmVNC but it takes dev cycles to mainain and bring it back to life.

 ### Compiling From Source
 See the [builder/README.md](https://github.com/kasmtech/KasmVNC/blob/master/builder/README.md). We containerize our build systems to ensure highly repeatable builds.

 ### License and Acknowledgements
-See the [LICENSE.TXT](https://github.com/kasmtech/KasmVNC/blob/master/LICENSE.TXT) and [ACKNOWLEDGEMENTS.md](https://github.com/kasmtech/KasmVNC/blob/master/ACKNOWLEDGEMENTS.md)
+See the [LICENSE.TXT](https://github.com/kasmtech/KasmVNC/blob/master/LICENSE.TXT) and [ACKNOWLEDGEMENTS.MD](https://github.com/kasmtech/KasmVNC/blob/master/LICENSE.TXT)
--- a/builder/README.md
+++ b/builder/README.md
@ -48,18 +48,6 @@ It will install the package inside a new container and run KasmVNC.

 Open browser and point to https://localhost:443/ or https://\<ip-address\>:443/

-## Debugging
-
-To debug a test container, run `test-deb ubuntu focal -s` or `test-deb ubuntu
-focal --shell`. It runs a shell instead of starting KasmVNC.
-
-## Testing performance
-
-To run a performance test, add `-p` option:
-```
-builder/test-deb ubuntu focal -p
-```
-
 # Package development

 ## deb/rpm package building and testing
@ -122,37 +110,6 @@ prepare_upload_filename "bionic/kasmvncserver_0.9.1~beta-1+libjpeg-turbo-latest_
 echo $upload_filename;'
 ```

-# vncserver development
-
-## Building a Ubuntu Focal package
-```
-builder/build-package ubuntu focal
-```
-
-You don't need to `build-package` every time you change something, but you need
-`Xvnc` and other files.
-
-## Running a development environment
-
-```
-builder/devenv-vncserver
-```
-
-`devenv-vncserver` starts a dockerized development environment. Edit
-`vncserver`, its modules, and configuration files as usual. When you
-run`vncserver`, not `/usr/bin/vncserver` will be used, but `./unix/vncserver`.
-Same for configuration files.
-
-Python specs can be run with `ty` alias inside devenv.
-
-### Debug output
-To see `vncserver` output, run `ty -d`. Anything you print inside `vncserver`
-with `say` should be visible that way.
-
-### Finding which spec produces a warning
-By default, each passing test is represented as a dot. `-v` flag causes tests to
-emit test descriptions alongside the program's output. Run `ty -v`.
-
 # ARM

 KasmVNC is supported on ARM, however, the build process needs to be broken into two parts with one occuring on a x64 system and the other on an ARM system. All our testing and official builds are done on AWS Graviton instances.
--- a/builder/build-apk
+++ b/builder/build-apk
@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. builder/os_ver_cli.sh
-
-cd "$(dirname "$0")/.."
-
-docker build -t kasmvnc_apkbuilder_${os}:${os_codename} -f \
-  builder/dockerfile.${os}_${os_codename}.apk.build .
-
-source_dir=$(echo $PWD)
-L_UID=$(id -u)
-L_GID=$(id -g)
-docker run --rm -v "$source_dir":/src --user $L_UID:$L_GID \
-  kasmvnc_apkbuilder_${os}:${os_codename} /bin/bash -c \
-  '/src/builder/build-apk-inside-docker'
--- a/builder/build-apk-inside-docker
+++ b/builder/build-apk-inside-docker
@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-os=alpine
-os_codename=$(cat /etc/os-release | awk '/VERSION_ID/' | grep -o '[[:digit:]]' | tr -d '\n' | head -c 3)
-
-mkdir -p /src/builder/build/${os}_${os_codename}
-mv \
-  /src/builder/build/kasmvnc.${os}_${os_codename}.tar.gz \
-  /src/builder/build/${os}_${os_codename}/kasmvnc.${os}_${os_codename}_$(uname -m).tgz
--- a/builder/build-deb-inside-docker
+++ b/builder/build-deb-inside-docker
@ -29,6 +29,5 @@ fi

 dpkg-buildpackage -us -uc -b
 mkdir -p "$os_dir"
-cp ../*dbgsym*deb "$os_dir"
 cp ../*.deb "$os_dir"
 lintian ../*.deb || true
--- a/builder/build-package
+++ b/builder/build-package
@ -10,8 +10,6 @@ detect_package_format() {
  package_format=rpm
  if ls builder/dockerfile*"$os"* | grep -q .deb.build; then
    package_format=deb
-  elif ls builder/dockerfile*"$os"* | grep -q .apk.build; then
-    package_format=apk
  fi
 }

--- a/builder/build-rpm-inside-docker
+++ b/builder/build-rpm-inside-docker
@ -8,7 +8,7 @@ prepare_build_env() {
 }

 copy_spec_and_tar_with_binaries() {
-  cp /tmp/*.spec ~/rpmbuild/SPECS/
+  cp /src/centos/kasmvncserver.spec ~/rpmbuild/SPECS/
  cp /src/builder/build/kasmvnc.${os}_${os_codename}.tar.gz \
    ~/rpmbuild/SOURCES/
 }
@ -20,16 +20,11 @@ copy_rpm_to_build_dir() {

 cd "$(dirname "$0")/.."

-if [ -z ${KASMVNC_BUILD_OS_CODENAME+x} ]; then
-  os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
-  os_codename=$(lsb_release -cs | tr '[:upper:]' '[:lower:]')
-else
-  os=${KASMVNC_BUILD_OS}
-  os_codename=${KASMVNC_BUILD_OS_CODENAME}
-fi
+os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
+os_codename=$(lsb_release -cs | tr '[:upper:]' '[:lower:]')
 os_dir="build/${os}_${os_codename}"

 prepare_build_env
-rpmbuild -ba ~/rpmbuild/SPECS/*.spec
+rpmbuild -ba ~/rpmbuild/SPECS/kasmvncserver.spec
 copy_rpm_to_build_dir
 rpmlint "$os_dir"/*.rpm || true
--- a/builder/build-tarball
+++ b/builder/build-tarball
@ -31,7 +31,6 @@ docker build -t "$builder_image" \
  -f builder/dockerfile.${os}_${os_codename}${build_tag}.build .
 mkdir -p builder/build
 docker run -v $shared_with_docker_dir:/build -e BUILD_TAG="$build_tag" \
-  -e KASMVNC_COMMIT_ID="$KASMVNC_COMMIT_ID" \
  --rm "$builder_image"

 L_GID=$(id -g)
--- a/builder/build.sh
+++ b/builder/build.sh
@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/sh -e

 detect_quilt() {
  if which quilt 1>/dev/null; then
@ -9,49 +7,17 @@ detect_quilt() {
  fi
 }

-ensure_crashpad_can_fetch_line_number_by_address() {
-  if [ ! -f /etc/centos-release ]; then
-    export LDFLAGS="$LDFLAGS -no-pie"
-  fi
-}
-
-
-fail_on_gcc_12() {
-  if [[ -n "$CC" && -n "$CXX" ]]; then
-    return;
-  fi
-
-  if gcc --version | head -1 | grep -q 12; then
-    cat >&2 <<EOF
-
-Error: gcc 12 detected. It has a bug causing the build to fall because of a
-Warray-bounds bug. Please use gcc 11 in the build Dockerfile:
-ENV CC=gcc-11
-ENV CXX=g++-11
-RUN <install gcc 11>
-EOF
-  exit 1
-  fi
-}
-
 # For build-dep to work, the apt sources need to have the source server
 #sudo apt-get build-dep xorg-server

 #sudo apt-get install cmake git libjpeg-dev libgnutls-dev

-# Gcc12 builds fail due to bug
-#fail_on_gcc_12
-
 # Ubuntu applies a million patches, but here we use upstream to simplify matters
 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"}
-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
+XORG_PATCH=$(echo "$XORG_VER" | grep -Po '^\d.\d+' | sed 's#\.##')
+wget --no-check-certificate https://www.x.org/archive/individual/xserver/xorg-server-${XORG_VER}.tar.bz2

 #git clone https://kasmweb@bitbucket.org/kasmtech/kasmvnc.git
 #cd kasmvnc
@ -64,24 +30,18 @@ sed -i -e '/find_package(FLTK/s@^@#@' \
 	-e '/add_subdirectory(tests/s@^@#@' \
 	CMakeLists.txt

-cmake -D CMAKE_BUILD_TYPE=RelWithDebInfo . -DBUILD_VIEWER:BOOL=OFF \
-  -DENABLE_GNUTLS:BOOL=OFF
+cmake -D CMAKE_BUILD_TYPE=RelWithDebInfo . -DBUILD_VIEWER:BOOL=OFF
 make -j5

-tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.gz --strip-components=1
+tar -C unix/xserver -xf /tmp/xorg-server-${XORG_VER}.tar.bz2 --strip-components=1

 cd unix/xserver
-# Apply patches
 patch -Np1 -i ../xserver${XORG_PATCH}.patch
 case "$XORG_VER" in
  1.20.*) 
-      patch -s -p0 < ../CVE-2022-2320-v1.20.patch
      if [ -f ../xserver120.7.patch ]; then
        patch -Np1 -i ../xserver120.7.patch
      fi ;;
-  1.19.*)
-      patch -s -p0 < ../CVE-2022-2320-v1.19.patch
-      ;;
 esac

 autoreconf -i
@ -89,43 +49,17 @@ autoreconf -i
 # The distro paths start after prefix and end with the font path,
 # everything after that is based on BUILDING.txt to remove unneeded
 # components.
-ensure_crashpad_can_fetch_line_number_by_address
-# Centos7 is too old for dri3
-if [ ! "${KASMVNC_BUILD_OS}" == "centos" ]; then
-  CONFIG_OPTIONS="--enable-dri3"
-fi
-# remove gl check for opensuse
-if [ "${KASMVNC_BUILD_OS}" == "opensuse" ] || ([ "${KASMVNC_BUILD_OS}" == "oracle" ] && [ "${KASMVNC_BUILD_OS_CODENAME}" == 9 ]); then
-  sed -i 's/LIBGL="gl >= 7.1.0"/LIBGL="gl >= 1.1"/g' configure
-fi
-
-# build X11
-./configure \
-    --disable-config-hal \
-    --disable-config-udev \
-    --disable-dmx \
-    --disable-dri \
-    --disable-dri2 \
-    --disable-kdrive \
-    --disable-static \
-    --disable-xephyr \
-    --disable-xinerama \
-    --disable-xnest \
-    --disable-xorg \
-    --disable-xvfb \
-    --disable-xwayland \
-    --disable-xwin \
-    --enable-glx \
-    --prefix=/opt/kasmweb \
-    --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
-    --without-dtrace \
-    --with-sha1=libcrypto \
-    --with-xkb-bin-directory=/usr/bin \
+./configure --prefix=/opt/kasmweb \
+	--with-xkb-path=/usr/share/X11/xkb \
 	--with-xkb-output=/var/lib/xkb \
-    --with-xkb-path=/usr/share/X11/xkb ${CONFIG_OPTIONS}
-
-# remove array bounds errors for new versions of GCC
-find . -name "Makefile" -exec sed -i 's/-Werror=array-bounds//g' {} \;
+	--with-xkb-bin-directory=/usr/bin \
+	--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
+	--with-pic --without-dtrace --disable-dri \
+        --disable-static \
+	--disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
+	--disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
+	--disable-config-hal --disable-config-udev \
+	--disable-dri2 --enable-glx --disable-xwayland --disable-dri3
 make -j5

 # modifications for the servertarball
@ -143,10 +77,6 @@ if [ -d /usr/lib/x86_64-linux-gnu/dri ]; then
  ln -s /usr/lib/x86_64-linux-gnu/dri dri
 elif [ -d /usr/lib/aarch64-linux-gnu/dri ]; then
  ln -s /usr/lib/aarch64-linux-gnu/dri dri
-elif [ -d /usr/lib/arm-linux-gnueabihf/dri ]; then
-  ln -s /usr/lib/arm-linux-gnueabihf/dri dri
-elif [ -d /usr/lib/xorg/modules/dri ]; then
-  ln -s /usr/lib/xorg/modules/dri dri
 else
  ln -s /usr/lib64/dri dri
 fi
@ -155,9 +85,7 @@ cd /src
 detect_quilt
 if [ -n "$QUILT_PRESENT" ]; then
  quilt push -a
-  echo 'Patches applied!'
 fi
-
 make servertarball

 cp kasmvnc*.tar.gz /build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz
--- a/builder/build_www.sh
+++ b/builder/build_www.sh
@ -15,4 +15,4 @@ cd /build
 rm *.md
 rm AUTHORS
 rm vnc.html
-ln -s index.html vnc.html
+rm vnc_lite.html
--- a/builder/bump-package-version
+++ b/builder/bump-package-version
@ -7,17 +7,24 @@ update_version_to_meet_packaging_standards() {
    sed -e 's/\([0-9]\)-\([a-zA-Z]\)/\1~\2/')
 }

-bump_rpm() {
-  builder/bump-package-version-rpm "$new_version"
+add_debian_revision_to_new_version() {
+  echo "$new_version-1"
 }

-bump_deb() {
-  builder/bump-package-version-deb "$new_version"
+bump_rpm() {
+  sed -i "s/^Version:.\+/Version:        $new_version/" centos/kasmvncserver.spec
 }

-bump_xvnc_binary() {
-  local cmd="s/#define XVNCVERSION.\+$/#define XVNCVERSION \"KasmVNC $new_version\"/"
-  sed -i -e "$cmd" unix/xserver/hw/vnc/xvnc.c
+bump_deb() {
+  local image="debbump_package_version:dev"
+  local L_UID=$(id -u)
+  local L_GID=$(id -g)
+  local debian_version=$(add_debian_revision_to_new_version)
+
+  docker build -t "$image" -f builder/dockerfile.bump-package-version .
+  docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \
+    "$image" /bin/bash -c \
+    "cd /src && builder/bump-package-version-inside-docker-deb $debian_version"
 }

 new_version="$1"
@ -30,6 +37,5 @@ fi
 cd "$(dirname "$0")/.."

 update_version_to_meet_packaging_standards
-bump_xvnc_binary
 bump_rpm
 bump_deb
--- a/builder/bump-package-version-deb
+++ b/builder/bump-package-version-deb
@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-new_version="$1"
-
-add_debian_revision_to_new_version() {
-  echo "$new_version-1"
-}
-
-bump_deb() {
-  local image="debbump_package_version:dev"
-  local L_UID=$(id -u)
-  local L_GID=$(id -g)
-  local debian_version=$(add_debian_revision_to_new_version)
-
-  docker build -t "$image" -f builder/dockerfile.bump-package-version .
-  docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \
-    "$image" /bin/bash -c \
-    "cd /src && builder/bump-package-version-inside-docker-deb $debian_version"
-}
-
-bump_deb
--- a/builder/bump-package-version-rpm
+++ b/builder/bump-package-version-rpm
@ -1,35 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-new_version="$1"
-spec_dirs=(centos oracle opensuse fedora)
-
-spec_files() {
-  for d in "${spec_dirs[@]}"; do
-    ls "$d"/*.spec
-  done
-}
-
-bump_version() {
-  sed -i "s/^Version:.\+/Version:        $new_version/" "$1"
-}
-
-detect_release_version() {
-  release_version=$(sed -ne 's/^Release:\s\+//p' "$1" | sed -e 's/%.\+$//')
-}
-
-bump_changelog() {
-  detect_release_version "$1"
-
-  local date=$(date +'%a %b %d %Y')
-  local changelog_version="$new_version-$release_version"
-  local new_changelog_entry="* $date KasmTech <info@kasmweb.com> - $changelog_version\n- Upstream release"
-
-  sed -i -e "s/%changelog/%changelog\n$new_changelog_entry/" "$1"
-}
-
-for spec_file in $(spec_files); do
-  bump_version $spec_file
-  bump_changelog $spec_file
-done
--- a/builder/common.sh
+++ b/builder/common.sh
@ -1 +0,0 @@
-VNC_PORT=8443
--- a/builder/devenv-vncserver
+++ b/builder/devenv-vncserver
@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-default_os=ubuntu
-default_os_codename=focal
-
-cd "$(dirname "$0")/.."
-. ./builder/os_ver_cli.sh
-. ./builder/common.sh
-
-docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
-  -t kasmvncdevenv_${os}:$os_codename \
-  -f builder/dockerfile.${os}_${os_codename}.vncserver_devenv.test .
-docker run -it -v $(realpath ${PWD}):/src -p "443:$VNC_PORT" -p "$VNC_PORT:$VNC_PORT" \
-  -p 8444:8444 \
-  -p 8445:8445 --rm \
-  -e KASMVNC_VERBOSE_LOGGING=$KASMVNC_VERBOSE_LOGGING \
-  -e "VNC_USER=foo" -e "VNC_PW=foobar" \
-  kasmvncdevenv_${os}:$os_codename
--- a/builder/dockerfile.alpine_317.apk.build
+++ b/builder/dockerfile.alpine_317.apk.build
@ -1,7 +0,0 @@
-FROM alpine:3.17
-
-RUN apk add shadow bash
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.alpine_317.build
+++ b/builder/dockerfile.alpine_317.build
@ -1,82 +0,0 @@
-FROM alpine:3.17
-
-ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 317
-ENV XORG_VER 21.1.8
-
-RUN \
-  echo "**** install build deps ****" && \
-  apk add \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    coreutils \
-    curl \
-    eudev-dev \
-    font-cursor-misc \
-    font-misc-misc \
-    font-util-dev \
-    git \
-    grep \
-    jq \
-    libdrm-dev \
-    libepoxy-dev \
-    libjpeg-turbo-dev \
-    libjpeg-turbo-static \
-    libpciaccess-dev \
-    libtool \
-    libwebp-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcb-dev \
-    libxcursor-dev \
-    libxcvt-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfont2-dev \
-    libxkbfile-dev \
-    libxrandr-dev \
-    libxshmfence-dev \
-    libxtst-dev \
-    mesa-dev \
-    mesa-dri-gallium \
-    meson \
-    nettle-dev \
-    openssl-dev \
-    pixman-dev \
-    procps \
-    shadow \
-    tar \
-    tzdata \
-    wayland-dev \
-    wayland-protocols \
-    xcb-util-dev \
-    xcb-util-image-dev \
-    xcb-util-keysyms-dev \
-    xcb-util-renderutil-dev \
-    xcb-util-wm-dev \
-    xinit \
-    xkbcomp \
-    xkbcomp-dev \
-    xkeyboard-config \
-    xorgproto \
-    xorg-server-common \
-    xorg-server-dev \
-    xtrans
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.alpine_318.apk.build
+++ b/builder/dockerfile.alpine_318.apk.build
@ -1,7 +0,0 @@
-FROM alpine:3.18
-
-RUN apk add shadow bash
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.alpine_318.build
+++ b/builder/dockerfile.alpine_318.build
@ -1,82 +0,0 @@
-FROM alpine:3.18
-
-ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 318
-ENV XORG_VER 21.1.10
-
-RUN \
-  echo "**** install build deps ****" && \
-  apk add \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    coreutils \
-    curl \
-    eudev-dev \
-    font-cursor-misc \
-    font-misc-misc \
-    font-util-dev \
-    git \
-    grep \
-    jq \
-    libdrm-dev \
-    libepoxy-dev \
-    libjpeg-turbo-dev \
-    libjpeg-turbo-static \
-    libpciaccess-dev \
-    libtool \
-    libwebp-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcb-dev \
-    libxcursor-dev \
-    libxcvt-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfont2-dev \
-    libxkbfile-dev \
-    libxrandr-dev \
-    libxshmfence-dev \
-    libxtst-dev \
-    mesa-dev \
-    mesa-dri-gallium \
-    meson \
-    nettle-dev \
-    openssl-dev \
-    pixman-dev \
-    procps \
-    shadow \
-    tar \
-    tzdata \
-    wayland-dev \
-    wayland-protocols \
-    xcb-util-dev \
-    xcb-util-image-dev \
-    xcb-util-keysyms-dev \
-    xcb-util-renderutil-dev \
-    xcb-util-wm-dev \
-    xinit \
-    xkbcomp \
-    xkbcomp-dev \
-    xkeyboard-config \
-    xorgproto \
-    xorg-server-common \
-    xorg-server-dev \
-    xtrans
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.alpine_319.apk.build
+++ b/builder/dockerfile.alpine_319.apk.build
@ -1,7 +0,0 @@
-FROM alpine:3.19
-
-RUN apk add shadow bash
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.alpine_319.build
+++ b/builder/dockerfile.alpine_319.build
@ -1,82 +0,0 @@
-FROM alpine:3.19
-
-ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 319
-ENV XORG_VER 21.1.12
-
-RUN \
-  echo "**** install build deps ****" && \
-  apk add \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    coreutils \
-    curl \
-    eudev-dev \
-    font-cursor-misc \
-    font-misc-misc \
-    font-util-dev \
-    git \
-    grep \
-    jq \
-    libdrm-dev \
-    libepoxy-dev \
-    libjpeg-turbo-dev \
-    libjpeg-turbo-static \
-    libpciaccess-dev \
-    libtool \
-    libwebp-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcb-dev \
-    libxcursor-dev \
-    libxcvt-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfont2-dev \
-    libxkbfile-dev \
-    libxrandr-dev \
-    libxshmfence-dev \
-    libxtst-dev \
-    mesa-dev \
-    mesa-dri-gallium \
-    meson \
-    nettle-dev \
-    openssl-dev \
-    pixman-dev \
-    procps \
-    shadow \
-    tar \
-    tzdata \
-    wayland-dev \
-    wayland-protocols \
-    xcb-util-dev \
-    xcb-util-image-dev \
-    xcb-util-keysyms-dev \
-    xcb-util-renderutil-dev \
-    xcb-util-wm-dev \
-    xinit \
-    xkbcomp \
-    xkbcomp-dev \
-    xkeyboard-config \
-    xorgproto \
-    xorg-server-common \
-    xorg-server-dev \
-    xtrans
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.alpine_320.apk.build
+++ b/builder/dockerfile.alpine_320.apk.build
@ -1,7 +0,0 @@
-FROM alpine:3.20
-
-RUN apk add shadow bash
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.alpine_320.build
+++ b/builder/dockerfile.alpine_320.build
@ -1,82 +0,0 @@
-FROM alpine:3.20
-
-ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 320
-ENV XORG_VER 21.1.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  apk add \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    coreutils \
-    curl \
-    eudev-dev \
-    font-cursor-misc \
-    font-misc-misc \
-    font-util-dev \
-    git \
-    grep \
-    jq \
-    libdrm-dev \
-    libepoxy-dev \
-    libjpeg-turbo-dev \
-    libjpeg-turbo-static \
-    libpciaccess-dev \
-    libtool \
-    libwebp-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcb-dev \
-    libxcursor-dev \
-    libxcvt-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfont2-dev \
-    libxkbfile-dev \
-    libxrandr-dev \
-    libxshmfence-dev \
-    libxtst-dev \
-    mesa-dev \
-    mesa-dri-gallium \
-    meson \
-    nettle-dev \
-    openssl-dev \
-    pixman-dev \
-    procps \
-    shadow \
-    tar \
-    tzdata \
-    wayland-dev \
-    wayland-protocols \
-    xcb-util-dev \
-    xcb-util-image-dev \
-    xcb-util-keysyms-dev \
-    xcb-util-renderutil-dev \
-    xcb-util-wm-dev \
-    xinit \
-    xkbcomp \
-    xkbcomp-dev \
-    xkeyboard-config \
-    xorgproto \
-    xorg-server-common \
-    xorg-server-dev \
-    xtrans
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.alpine_321.apk.build
+++ b/builder/dockerfile.alpine_321.apk.build
@ -1,7 +0,0 @@
-FROM alpine:3.21
-
-RUN apk add shadow bash
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.alpine_321.build
+++ b/builder/dockerfile.alpine_321.build
@ -1,82 +0,0 @@
-FROM alpine:3.21
-
-ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 321
-ENV XORG_VER 21.1.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  apk add \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    coreutils \
-    curl \
-    eudev-dev \
-    font-cursor-misc \
-    font-misc-misc \
-    font-util-dev \
-    git \
-    grep \
-    jq \
-    libdrm-dev \
-    libepoxy-dev \
-    libjpeg-turbo-dev \
-    libjpeg-turbo-static \
-    libpciaccess-dev \
-    libtool \
-    libwebp-dev \
-    libx11-dev \
-    libxau-dev \
-    libxcb-dev \
-    libxcursor-dev \
-    libxcvt-dev \
-    libxdmcp-dev \
-    libxext-dev \
-    libxfont2-dev \
-    libxkbfile-dev \
-    libxrandr-dev \
-    libxshmfence-dev \
-    libxtst-dev \
-    mesa-dev \
-    mesa-dri-gallium \
-    meson \
-    nettle-dev \
-    openssl-dev \
-    pixman-dev \
-    procps \
-    shadow \
-    tar \
-    tzdata \
-    wayland-dev \
-    wayland-protocols \
-    xcb-util-dev \
-    xcb-util-image-dev \
-    xcb-util-keysyms-dev \
-    xcb-util-renderutil-dev \
-    xcb-util-wm-dev \
-    xinit \
-    xkbcomp \
-    xkbcomp-dev \
-    xkeyboard-config \
-    xorgproto \
-    xorg-server-common \
-    xorg-server-dev \
-    xtrans
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.centos_core.barebones.rpm.test
+++ b/builder/dockerfile.centos_core.barebones.rpm.test
@ -1,20 +1,18 @@
 FROM centos:centos7

-ENV STARTUPDIR=/dockerstartup
-
 RUN yum install -y xterm
 RUN yum install -y vim less
 RUN yum install -y redhat-lsb-core
-RUN yum install -y epel-release

 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
 RUN yum localinstall -y /tmp/*.rpm

-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
 RUN useradd -m foo
+
 USER foo:kasmvnc-cert

-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | kasmvncpasswd -w -u \"$VNC_USER\" && vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/pki/tls/private/kasmvnc.pem -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
--- a/builder/dockerfile.centos_core.build
+++ b/builder/dockerfile.centos_core.build
@ -3,18 +3,16 @@ FROM centos:centos7
 ENV KASMVNC_BUILD_OS centos
 ENV KASMVNC_BUILD_OS_CODENAME core

-RUN yum install -y ca-certificates
+RUN yum update -y ca-certificates
 RUN yum install -y build-dep xorg-server libxfont-dev sudo
-RUN yum install -y gcc cmake git libgnutls28-dev vim wget tightvncserver
-RUN yum install -y libpng-dev libtiff-dev libgif-dev libavcodec-dev openssl-devel
+RUN yum install -y gcc cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN yum install -y libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev openssl-devel
 RUN yum install -y make
 RUN yum group install -y "Development Tools"
-RUN yum install -y xorg-x11-server-devel zlib-devel
+RUN yum install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
 RUN yum install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
-  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel libXrandr-devel pam-devel \
-  gnutls-devel libX11-devel libXtst-devel libXcursor-devel
+  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel
 RUN yum install -y mesa-dri-drivers
-RUN yum install -y ca-certificates

 # Additions for webp
 RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
@ -23,10 +21,6 @@ RUN cd /tmp/libwebp-1.0.2 && \
    ./configure --enable-static --disable-shared && \
    make && make install

-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
 RUN useradd -m docker && echo "docker:docker" | chpasswd

 COPY --chown=docker:docker . /src/
--- a/builder/dockerfile.centos_core.rpm.test
+++ b/builder/dockerfile.centos_core.rpm.test
@ -37,20 +37,18 @@ RUN yum install -y epel-release && yum groupinstall xfce -y
 RUN yum erase -y pm-utils xscreensaver*
 RUN yum install -y redhat-lsb-core
 RUN yum install -y vim less
+RUN yum localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./centos/kasmvncserver.spec /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
+RUN yum localinstall -y /tmp/*.rpm

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.debian_bookworm.build
+++ b/builder/dockerfile.debian_bookworm.build
@ -1,38 +0,0 @@
-FROM debian:bookworm-slim
-
-ENV KASMVNC_BUILD_OS debian
-ENV KASMVNC_BUILD_OS_CODENAME bookworm
-ENV XORG_VER 21.1.7
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN \
-  echo "**** add all sources ****" && \
-  echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
-  echo "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-  echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-  echo "deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-  echo "deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-  echo "deb-src http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-  echo "deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-  echo "deb-src http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-  rm -f /etc/apt/sources.list.d/debian.sources
-
-RUN apt-get update && \
-      apt-get -y install sudo
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
-RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.debian_bookworm.deb.build
+++ b/builder/dockerfile.debian_bookworm.deb.build
@ -1,19 +0,0 @@
-FROM debian:bookworm
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && \
-      apt-get -y install vim build-essential devscripts equivs
-
-# Install build-deps for the package.
-COPY ./debian/control /tmp
-RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
-
-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
--- a/builder/dockerfile.debian_bookworm.deb.test
+++ b/builder/dockerfile.debian_bookworm.deb.test
@ -1,57 +0,0 @@
-FROM debian:bookworm-slim
-
-ENV DISPLAY=:1 \
-    VNC_PORT=8443 \
-    VNC_RESOLUTION=1280x720 \
-    MAX_FRAME_RATE=24 \
-    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
-    HOME=/home/user \
-    TERM=xterm \
-    STARTUPDIR=/dockerstartup \
-    INST_SCRIPTS=/dockerstartup/install \
-    KASM_RX_HOME=/dockerstartup/kasmrx \
-    DEBIAN_FRONTEND=noninteractive \
-    VNC_COL_DEPTH=24 \
-    VNC_RESOLUTION=1280x1024 \
-    VNC_PW=vncpassword \
-    VNC_USER=user \
-    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/usr/local/lib/ \
-    OMP_WAIT_POLICY=PASSIVE \
-    SHELL=/bin/bash \
-    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=debian \
-    KASMVNC_BUILD_OS_CODENAME=buster
-
-EXPOSE $VNC_PORT
-
-WORKDIR $HOME
-
-### REQUIRED STUFF ###
-
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal dbus-x11 xterm libnss-wrapper gettext wget
-RUN apt-get purge -y pm-utils xscreensaver*
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get update && apt-get -y install lsb-release
-
-RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
-
-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
-
-### START CUSTOM STUFF ####
-
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
-
-### END CUSTOM STUFF ###
-
-RUN chown -R 1000:0 $HOME
-USER 1000:ssl-cert
-WORKDIR $HOME
-
-ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.debian_bullseye.build
+++ b/builder/dockerfile.debian_bullseye.build
@ -12,13 +12,15 @@ RUN apt-get update && \

 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

--- a/builder/dockerfile.debian_bullseye.deb.test
+++ b/builder/dockerfile.debian_bullseye.deb.test
@ -37,16 +37,13 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.debian_buster.barebones.deb.test
+++ b/builder/dockerfile.debian_buster.barebones.deb.test
@ -1,19 +1,19 @@
 FROM debian:buster-slim

-ENV STARTUPDIR=/dockerstartup
-
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN rm -f /tmp/kasmvncserver_*+*.deb; apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
 RUN apt-get update && apt-get -y install xterm

-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/vnc_startup_barebones.sh $STARTUPDIR
+COPY startup/deb/kasmvncserver-easy-start /usr/local/bin

 RUN useradd -m foo
+
 USER foo:ssl-cert

-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | \
+  kasmvncpasswd -w -u $VNC_USER $HOME/.kasmpasswd && \
+  kasmvncserver-easy-start && tail -f $HOME/.vnc/*.log"
--- a/builder/dockerfile.debian_buster.build
+++ b/builder/dockerfile.debian_buster.build
@ -12,13 +12,15 @@ RUN apt-get update && \

 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

--- a/builder/dockerfile.debian_buster.deb.test
+++ b/builder/dockerfile.debian_buster.deb.test
@ -34,18 +34,24 @@ RUN apt-get purge -y pm-utils xscreensaver*
 RUN apt-get update && apt-get install -y vim less
 RUN apt-get update && apt-get -y install lsb-release

+RUN apt-get update && apt-get install -y task-cinnamon-desktop
+RUN apt-get update && apt-get install -y task-gnome-desktop
+RUN mkdir -p /usr/share/man/man1
+RUN apt-get update && apt-get install -y apt-utils openjdk-11-jre
+RUN apt-get update && apt-get install -y task-lxde-desktop
+RUN apt-get update && apt-get install -y task-mate-desktop
+RUN apt-get update && apt-get install -y task-kde-desktop
+
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp

 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.fedora_forty.build
+++ b/builder/dockerfile.fedora_forty.build
@ -1,86 +0,0 @@
-FROM fedora:40
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME forty
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  dnf group install -y \
-    "C Development Tools and Libraries" \
-    "Development Tools" && \
-  dnf install -y \
-    autoconf \
-    automake \
-    bison \
-    byacc \
-    bzip2 \
-    cmake \
-    diffutils \
-    doxygen \
-    file \
-    flex \
-    fop \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-devel \
-    libdrm-devel \
-    libepoxy-devel \
-    libmd-devel \
-    libpciaccess-devel \
-    libtool \
-    libwebp-devel \
-    libX11-devel \
-    libXau-devel \
-    libxcb-devel \
-    libXcursor-devel \
-    libxcvt-devel \
-    libXdmcp-devel \
-    libXext-devel \
-    libXfont2-devel \
-    libxkbfile-devel \
-    libXrandr-devel \
-    libxshmfence-devel \
-    libXtst-devel \
-    mesa-libEGL-devel \
-    mesa-libgbm-devel \
-    mesa-libGL-devel \
-    meson \
-    mingw64-binutils \
-    mt-st \
-    nettle-devel \
-    openssl-devel \
-    patch \
-    pixman-devel \
-    wayland-devel \
-    wget \
-    which \
-    xcb-util-devel \
-    xcb-util-image-devel \
-    xcb-util-keysyms-devel \
-    xcb-util-renderutil-devel \
-    xcb-util-wm-devel \
-    xinit \
-    xkbcomp \
-    xkbcomp-devel \
-    xkeyboard-config \
-    xmlto \
-    xorg-x11-font-utils \
-    xorg-x11-proto-devel \
-    xorg-x11-server-common \
-    xorg-x11-server-devel \
-    xorg-x11-xtrans-devel \
-    xsltproc
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_forty.rpm.build
+++ b/builder/dockerfile.fedora_forty.rpm.build
@ -1,13 +0,0 @@
-FROM fedora:40
-
-RUN dnf install -y fedora-packager fedora-review
-RUN dnf install -y tree vim less
-RUN dnf install -y redhat-lsb-core
-RUN dnf install -y dnf-plugins-core
-
-COPY fedora/*.spec /tmp
-RUN dnf builddep -y /tmp/*.spec
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.fedora_fortyone.build
+++ b/builder/dockerfile.fedora_fortyone.build
@ -1,87 +0,0 @@
-FROM fedora:41
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME fortyone
-ENV XORG_VER 21.1.15
-
-RUN \
-  echo "**** install build deps ****" && \
-  dnf group install -y \
-    c-development \
-    development-tools \
-    development-libs && \
-  dnf install -y \
-    autoconf \
-    automake \
-    bison \
-    byacc \
-    bzip2 \
-    cmake \
-    diffutils \
-    doxygen \
-    file \
-    flex \
-    fop \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-devel \
-    libdrm-devel \
-    libepoxy-devel \
-    libmd-devel \
-    libpciaccess-devel \
-    libtool \
-    libwebp-devel \
-    libX11-devel \
-    libXau-devel \
-    libxcb-devel \
-    libXcursor-devel \
-    libxcvt-devel \
-    libXdmcp-devel \
-    libXext-devel \
-    libXfont2-devel \
-    libxkbfile-devel \
-    libXrandr-devel \
-    libxshmfence-devel \
-    libXtst-devel \
-    mesa-libEGL-devel \
-    mesa-libgbm-devel \
-    mesa-libGL-devel \
-    meson \
-    mingw64-binutils \
-    mt-st \
-    nettle-devel \
-    openssl-devel \
-    patch \
-    pixman-devel \
-    wayland-devel \
-    wget \
-    which \
-    xcb-util-devel \
-    xcb-util-image-devel \
-    xcb-util-keysyms-devel \
-    xcb-util-renderutil-devel \
-    xcb-util-wm-devel \
-    xinit \
-    xkbcomp \
-    xkbcomp-devel \
-    xkeyboard-config \
-    xmlto \
-    xorg-x11-font-utils \
-    xorg-x11-proto-devel \
-    xorg-x11-server-common \
-    xorg-x11-server-devel \
-    xorg-x11-xtrans-devel \
-    xsltproc
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_fortyone.rpm.build
+++ b/builder/dockerfile.fedora_fortyone.rpm.build
@ -1,13 +0,0 @@
-FROM fedora:41
-
-RUN dnf install -y fedora-packager fedora-review
-RUN dnf install -y tree vim less
-RUN dnf install -y redhat-lsb-core
-RUN dnf install -y dnf-plugins-core
-
-COPY fedora/*.spec /tmp
-RUN dnf builddep -y /tmp/*.spec
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.fedora_thirtyeight.barebones.rpm.test
+++ b/builder/dockerfile.fedora_thirtyeight.barebones.rpm.test
@ -1,19 +0,0 @@
-FROM fedora:38
-
-ENV STARTUPDIR=/dockerstartup
-
-RUN dnf install -y xterm
-RUN dnf install -y vim less
-RUN yum install -y redhat-lsb-core
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
-RUN dnf localinstall -y /tmp/*.rpm
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.fedora_thirtyeight.build
+++ b/builder/dockerfile.fedora_thirtyeight.build
@ -1,86 +0,0 @@
-FROM fedora:38
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME thirtyeight
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  dnf group install -y \
-    "C Development Tools and Libraries" \
-    "Development Tools" && \
-  dnf install -y \
-    autoconf \
-    automake \
-    bison \
-    byacc \
-    bzip2 \
-    cmake \
-    diffutils \
-    doxygen \
-    file \
-    flex \
-    fop \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-devel \
-    libdrm-devel \
-    libepoxy-devel \
-    libmd-devel \
-    libpciaccess-devel \
-    libtool \
-    libwebp-devel \
-    libX11-devel \
-    libXau-devel \
-    libxcb-devel \
-    libXcursor-devel \
-    libxcvt-devel \
-    libXdmcp-devel \
-    libXext-devel \
-    libXfont2-devel \
-    libxkbfile-devel \
-    libXrandr-devel \
-    libxshmfence-devel \
-    libXtst-devel \
-    mesa-libEGL-devel \
-    mesa-libgbm-devel \
-    mesa-libGL-devel \
-    meson \
-    mingw64-binutils \
-    mt-st \
-    nettle-devel \
-    openssl-devel \
-    patch \
-    pixman-devel \
-    wayland-devel \
-    wget \
-    which \
-    xcb-util-devel \
-    xcb-util-image-devel \
-    xcb-util-keysyms-devel \
-    xcb-util-renderutil-devel \
-    xcb-util-wm-devel \
-    xinit \
-    xkbcomp \
-    xkbcomp-devel \
-    xkeyboard-config \
-    xmlto \
-    xorg-x11-font-utils \
-    xorg-x11-proto-devel \
-    xorg-x11-server-common \
-    xorg-x11-server-devel \
-    xorg-x11-xtrans-devel \
-    xsltproc
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_thirtyeight.rpm.build
+++ b/builder/dockerfile.fedora_thirtyeight.rpm.build
@ -1,13 +0,0 @@
-FROM fedora:38
-
-RUN dnf install -y fedora-packager fedora-review
-RUN dnf install -y tree vim less
-RUN dnf install -y redhat-lsb-core
-RUN dnf install -y dnf-plugins-core
-
-COPY fedora/*.spec /tmp
-RUN dnf builddep -y /tmp/*.spec
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.fedora_thirtyeight.rpm.test
+++ b/builder/dockerfile.fedora_thirtyeight.rpm.test
@ -1,62 +0,0 @@
-FROM fedora:38
-
-ENV DISPLAY=:1 \
-    VNC_PORT=8443 \
-    VNC_RESOLUTION=1280x720 \
-    MAX_FRAME_RATE=24 \
-    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
-    HOME=/home/user \
-    TERM=xterm \
-    STARTUPDIR=/dockerstartup \
-    INST_SCRIPTS=/dockerstartup/install \
-    KASM_RX_HOME=/dockerstartup/kasmrx \
-    DEBIAN_FRONTEND=noninteractive \
-    VNC_COL_DEPTH=24 \
-    VNC_RESOLUTION=1280x1024 \
-    VNC_PW=vncpassword \
-    VNC_USER=user \
-    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/usr/local/lib/ \
-    OMP_WAIT_POLICY=PASSIVE \
-    SHELL=/bin/bash \
-    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=fedora \
-    KASMVNC_BUILD_OS_CODENAME=thirtythree
-
-EXPOSE $VNC_PORT
-
-WORKDIR $HOME
-
-### REQUIRED STUFF ###
-
-RUN dnf install -y openssl xterm gettext wget
-RUN dnf install -y nss_wrapper
-RUN dnf install -y xorg-x11-xauth xkeyboard-config
-# xorg-x11-server-Xorg
-# RUN dnf install -y @xfce-desktop-environment
-RUN dnf erase -y pm-utils xscreensaver*
-RUN dnf install -y redhat-lsb-core
-RUN dnf install -y vim less
-RUN dnf install -y @xfce-desktop-environment
-
-RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
-
-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
-
-### START CUSTOM STUFF ####
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./fedora/kasmvncserver.spec /tmp
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
-# RUN dnf remove -y tigervnc-server-minimal
-RUN /tmp/scripts/install_kasmvncserver_package
-
-### END CUSTOM STUFF ###
-
-RUN chown -R 1000:0 $HOME
-USER 1000:kasmvnc-cert
-WORKDIR $HOME
-
-ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.fedora_thirtynine.build
+++ b/builder/dockerfile.fedora_thirtynine.build
@ -1,86 +0,0 @@
-FROM fedora:39
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME thirtynine
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  dnf group install -y \
-    "C Development Tools and Libraries" \
-    "Development Tools" && \
-  dnf install -y \
-    autoconf \
-    automake \
-    bison \
-    byacc \
-    bzip2 \
-    cmake \
-    diffutils \
-    doxygen \
-    file \
-    flex \
-    fop \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-devel \
-    libdrm-devel \
-    libepoxy-devel \
-    libmd-devel \
-    libpciaccess-devel \
-    libtool \
-    libwebp-devel \
-    libX11-devel \
-    libXau-devel \
-    libxcb-devel \
-    libXcursor-devel \
-    libxcvt-devel \
-    libXdmcp-devel \
-    libXext-devel \
-    libXfont2-devel \
-    libxkbfile-devel \
-    libXrandr-devel \
-    libxshmfence-devel \
-    libXtst-devel \
-    mesa-libEGL-devel \
-    mesa-libgbm-devel \
-    mesa-libGL-devel \
-    meson \
-    mingw64-binutils \
-    mt-st \
-    nettle-devel \
-    openssl-devel \
-    patch \
-    pixman-devel \
-    wayland-devel \
-    wget \
-    which \
-    xcb-util-devel \
-    xcb-util-image-devel \
-    xcb-util-keysyms-devel \
-    xcb-util-renderutil-devel \
-    xcb-util-wm-devel \
-    xinit \
-    xkbcomp \
-    xkbcomp-devel \
-    xkeyboard-config \
-    xmlto \
-    xorg-x11-font-utils \
-    xorg-x11-proto-devel \
-    xorg-x11-server-common \
-    xorg-x11-server-devel \
-    xorg-x11-xtrans-devel \
-    xsltproc
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_thirtyseven.barebones.rpm.test
+++ b/builder/dockerfile.fedora_thirtyseven.barebones.rpm.test
@ -1,19 +0,0 @@
-FROM fedora:37
-
-ENV STARTUPDIR=/dockerstartup
-
-RUN dnf install -y xterm
-RUN dnf install -y vim less
-RUN yum install -y redhat-lsb-core
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
-RUN dnf localinstall -y /tmp/*.rpm
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.fedora_thirtyseven.build
+++ b/builder/dockerfile.fedora_thirtyseven.build
@ -1,86 +0,0 @@
-FROM fedora:37
-
-ENV KASMVNC_BUILD_OS fedora
-ENV KASMVNC_BUILD_OS_CODENAME thirtyseven
-ENV XORG_VER 1.20.14
-
-RUN \
-  echo "**** install build deps ****" && \
-  dnf group install -y \
-    "C Development Tools and Libraries" \
-    "Development Tools" && \
-  dnf install -y \
-    autoconf \
-    automake \
-    bison \
-    byacc \
-    bzip2 \
-    cmake \
-    diffutils \
-    doxygen \
-    file \
-    flex \
-    fop \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-devel \
-    libdrm-devel \
-    libepoxy-devel \
-    libmd-devel \
-    libpciaccess-devel \
-    libtool \
-    libwebp-devel \
-    libX11-devel \
-    libXau-devel \
-    libxcb-devel \
-    libXcursor-devel \
-    libxcvt-devel \
-    libXdmcp-devel \
-    libXext-devel \
-    libXfont2-devel \
-    libxkbfile-devel \
-    libXrandr-devel \
-    libxshmfence-devel \
-    libXtst-devel \
-    mesa-libEGL-devel \
-    mesa-libgbm-devel \
-    mesa-libGL-devel \
-    meson \
-    mingw64-binutils \
-    mt-st \
-    nettle-devel \
-    openssl-devel \
-    patch \
-    pixman-devel \
-    wayland-devel \
-    wget \
-    which \
-    xcb-util-devel \
-    xcb-util-image-devel \
-    xcb-util-keysyms-devel \
-    xcb-util-renderutil-devel \
-    xcb-util-wm-devel \
-    xinit \
-    xkbcomp \
-    xkbcomp-devel \
-    xkeyboard-config \
-    xmlto \
-    xorg-x11-font-utils \
-    xorg-x11-proto-devel \
-    xorg-x11-server-common \
-    xorg-x11-server-devel \
-    xorg-x11-xtrans-devel \
-    xsltproc
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_thirtyseven.rpm.build
+++ b/builder/dockerfile.fedora_thirtyseven.rpm.build
@ -1,13 +0,0 @@
-FROM fedora:37
-
-RUN dnf install -y fedora-packager fedora-review
-RUN dnf install -y tree vim less
-RUN dnf install -y redhat-lsb-core
-RUN dnf install -y dnf-plugins-core
-
-COPY fedora/*.spec /tmp
-RUN dnf builddep -y /tmp/*.spec
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.fedora_thirtythree.barebones.rpm.test
+++ b/builder/dockerfile.fedora_thirtythree.barebones.rpm.test
@ -0,0 +1,18 @@
+FROM fedora:33
+
+RUN dnf install -y xterm
+RUN dnf install -y vim less
+RUN yum install -y redhat-lsb-core
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
+RUN dnf localinstall -y /tmp/*.rpm
+
+RUN useradd -m foo
+
+USER foo:kasmvnc-cert
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | kasmvncpasswd -w -u \"$VNC_USER\" && vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/pki/tls/private/kasmvnc.pem -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
--- a/builder/dockerfile.fedora_thirtythree.build
+++ b/builder/dockerfile.fedora_thirtythree.build
@ -0,0 +1,37 @@
+FROM fedora:33
+
+ENV KASMVNC_BUILD_OS fedora
+ENV KASMVNC_BUILD_OS_CODENAME thirtythree
+ENV XORG_VER 1.20.10
+
+# RUN dnf install -y build-dep xorg-server libxfont-dev sudo
+RUN dnf install -y gcc cmake git gnutls-devel vim wget
+#tightvncserver
+RUN dnf install -y libjpeg-turbo-devel libpng-devel libtiff-devel giflib-devel openssl-devel
+
+#libavcodec-dev
+RUN dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+RUN dnf -y install ffmpeg-devel
+
+RUN dnf install -y make
+RUN dnf group install -y "Development Tools"
+RUN dnf install -y xorg-x11-server-devel zlib-devel libjpeg-turbo-devel
+RUN dnf install -y libxkbfile-devel libXfont2-devel xorg-x11-font-utils \
+  xorg-x11-xtrans-devel xorg-x11-xkb-utils-devel
+RUN dnf install -y mesa-dri-drivers
+RUN dnf install -y bzip2 redhat-lsb-core
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd
+
+COPY --chown=docker:docker . /src/
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.fedora_thirtythree.rpm.build
+++ b/builder/dockerfile.fedora_thirtythree.rpm.build
@ -1,11 +1,11 @@
-FROM fedora:39
+FROM fedora:33

 RUN dnf install -y fedora-packager fedora-review
 RUN dnf install -y tree vim less
 RUN dnf install -y redhat-lsb-core
 RUN dnf install -y dnf-plugins-core

-COPY fedora/*.spec /tmp
+COPY centos/*.spec /tmp
 RUN dnf builddep -y /tmp/*.spec

 RUN useradd -m docker && echo "docker:docker" | chpasswd
--- a/builder/dockerfile.fedora_thirtythree.rpm.test
+++ b/builder/dockerfile.fedora_thirtythree.rpm.test
@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:33

 ENV DISPLAY=:1 \
    VNC_PORT=8443 \
@ -31,27 +31,26 @@ WORKDIR $HOME

 RUN dnf install -y openssl xterm gettext wget
 RUN dnf install -y nss_wrapper
-RUN dnf install -y xorg-x11-xauth xkeyboard-config
+RUN dnf install -y xorg-x11-xauth xorg-x11-xkb-utils \
+  xkeyboard-config xorg-x11-server-utils
 # xorg-x11-server-Xorg
 # RUN dnf install -y @xfce-desktop-environment
+RUN dnf group install -y lxde-desktop
 RUN dnf erase -y pm-utils xscreensaver*
 RUN dnf install -y redhat-lsb-core
 RUN dnf install -y vim less
-RUN dnf install -y @xfce-desktop-environment

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./fedora/kasmvncserver.spec /tmp

 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp/
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
 # RUN dnf remove -y tigervnc-server-minimal
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN dnf localinstall -y --allowerasing /tmp/*.rpm

 ### END CUSTOM STUFF ###

@ -59,4 +58,7 @@ RUN chown -R 1000:0 $HOME
 USER 1000:kasmvnc-cert
 WORKDIR $HOME

+RUN mkdir ~/.vnc && echo '/usr/bin/lxsession -s LXDE &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
 ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.kali_kali-rolling.build
+++ b/builder/dockerfile.kali_kali-rolling.build
@ -2,7 +2,7 @@ FROM kalilinux/kali-rolling:latest

 ENV KASMVNC_BUILD_OS kali
 ENV KASMVNC_BUILD_OS_CODENAME kali-rolling
-ENV XORG_VER 21.1.14
+ENV XORG_VER 1.20.10
 ENV DEBIAN_FRONTEND noninteractive

 RUN grep '^deb'  /etc/apt/sources.list | sed 's#^deb#deb-src#' >> /etc/apt/sources.list
@ -12,14 +12,15 @@ RUN apt-get update && \

 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install gcc g++ curl
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

--- a/builder/dockerfile.kali_kali-rolling.deb.test
+++ b/builder/dockerfile.kali_kali-rolling.deb.test
@ -37,15 +37,13 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp

 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.opensuse_15.barebones.rpm.test
+++ b/builder/dockerfile.opensuse_15.barebones.rpm.test
@ -1,23 +0,0 @@
-FROM opensuse/leap:15.5
-
-ENV STARTUPDIR=/dockerstartup
-
-# base tools
-RUN zypper -n install -y \
-  less \
-  vim \
-  xterm
-
-# Cache repo updates, so that package changes don't trigger it on every build.
-RUN zypper refresh
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
-RUN zypper install -y --allow-unsigned-rpm /tmp/*.rpm
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.opensuse_15.build
+++ b/builder/dockerfile.opensuse_15.build
@ -1,61 +0,0 @@
-FROM opensuse/leap:15.5
-
-ENV KASMVNC_BUILD_OS opensuse
-ENV KASMVNC_BUILD_OS_CODENAME 15
-ENV XORG_VER 1.20.3
-
-# Install depends
-RUN zypper install -ny \
-  bdftopcf \
-  bigreqsproto-devel \
-  cmake \
-  curl \
-  ffmpeg-4-libavcodec-devel \
-  fonttosfnt \
-  font-util \
-  gcc \
-  gcc-c++ \
-  giflib-devel \
-  git \
-  gzip \
-  lbzip2 \
-  libbz2-devel \
-  libgbm-devel \
-  libGLw-devel \
-  libgnutls-devel \
-  libopenssl-devel \
-  libpng16-devel \
-  libpnglite0 \
-  png++-devel \
-  libtiff-devel \
-  libXfont2-devel \
-  libxkbcommon-x11-devel \
-  libxshmfence-devel \
-  make \
-  Mesa-dri \
-  Mesa-libglapi-devel \
-  mkfontdir \
-  mkfontscale \
-  patch \
-  tigervnc \
-  wget \
-  xcmiscproto-devel \
-  xorg-x11-devel \
-  xorg-x11-server-sdk \
-  xorg-x11-util-devel \
-  zlib-devel
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -u 1000 docker && \
-  groupadd -g 1000 docker && \
-  usermod -a -G docker docker
-
-COPY --chown=docker:docker . /src/
-
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.opensuse_15.rpm.build
+++ b/builder/dockerfile.opensuse_15.rpm.build
@ -1,27 +0,0 @@
-FROM opensuse/leap:15.5
-
-ENV KASMVNC_BUILD_OS opensuse
-ENV KASMVNC_BUILD_OS_CODENAME 15
-
-RUN zypper -n install -y \
-  gpg* \
-  less \
-  lsb-release \
-  rng-tools \
-  rpm-build \
-  rpmdevtools \
-  rpmlint \
-  tree \
-  vim
-
-# Cache repo updates, so that spec changes don't trigger it on every build.
-RUN zypper refresh
-COPY opensuse/*.spec /tmp
-
-RUN zypper -n install $(grep BuildRequires /tmp/*.spec | cut -d' ' -f2 | xargs)
-
-RUN useradd -u 1000 -m -d /home/docker docker && \
-  groupadd -g 1000 docker && \
-  usermod -a -G docker docker
-
-USER docker
--- a/builder/dockerfile.oracle_8.barebones.rpm.test
+++ b/builder/dockerfile.oracle_8.barebones.rpm.test
@ -1,23 +0,0 @@
-FROM oraclelinux:8
-
-ENV STARTUPDIR=/dockerstartup
-
-RUN dnf install -y \
-  less \
-  redhat-lsb-core \
-  vim \
-  xterm
-RUN dnf config-manager --set-enabled ol8_codeready_builder
-RUN dnf install -y oracle-epel-release-el8
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
-RUN dnf localinstall -y /tmp/*.rpm
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.oracle_8.build
+++ b/builder/dockerfile.oracle_8.build
@ -1,63 +0,0 @@
-FROM oraclelinux:8
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 8
-ENV XORG_VER 1.20.11
-
-# Install from stock repos
-RUN \
-  dnf install -y 'dnf-command(config-manager)' && \
-  dnf config-manager --set-enabled ol8_codeready_builder && \
-  dnf install -y \
-    bzip2-devel \
-    ca-certificates \
-    cmake \
-    dnf-plugins-core \
-    gcc \
-    gcc-c++ \
-    git \
-    gnutls-devel \
-    libjpeg-turbo-devel \
-    libpng-devel \
-    libtiff-devel \
-    libxshmfence-devel \
-    make \
-    mesa-dri-drivers \
-    mesa-libgbm-devel \
-    openssl-devel \
-    patch \
-    tigervnc-server \
-    wget \
-    xorg-x11-font-utils \
-    zlib-devel
-
-# Enable additional repos (epel, powertools, and fusion)
-RUN dnf config-manager --set-enabled ol8_codeready_builder
-RUN dnf install -y oracle-epel-release-el8
-RUN dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm
-
-# Install from new repos
-RUN dnf install -y \
-  ffmpeg-devel \
-  giflib-devel \
-  lbzip2 \
-  libXfont2-devel \
-  libxkbfile-devel \
-  xorg-x11-server-devel \
-  xorg-x11-xkb-utils-devel \
-  xorg-x11-xtrans-devel \
-  libXrandr-devel \
-  libXtst-devel \
-  libXcursor-devel
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.oracle_8.rpm.build
+++ b/builder/dockerfile.oracle_8.rpm.build
@ -1,21 +0,0 @@
-FROM oraclelinux:8
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 8
-
-RUN dnf install -y \
-  gpg* \
-  less \
-  redhat-lsb-core \
-  rng-tools \
-  rpm* \
-  rpmlint \
-  tree \
-  vim
-
-COPY oracle/kasmvncserver.spec /tmp
-RUN dnf builddep -y /tmp/*.spec
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.oracle_9.barebones.rpm.test
+++ b/builder/dockerfile.oracle_9.barebones.rpm.test
@ -1,25 +0,0 @@
-FROM oraclelinux:9
-
-ENV STARTUPDIR=/dockerstartup
-
-RUN dnf install -y \
-  less \
-  vim \
-  xterm
-RUN dnf config-manager --set-enabled ol9_codeready_builder
-RUN dnf install -y oracle-epel-release-el9
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
-RUN dnf localinstall -y /tmp/*.rpm
-
-RUN dnf install -y crypto-policies-scripts
-RUN update-crypto-policies --set FIPS:SHA1
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/vnc_startup_barebones.sh $STARTUPDIR
-
-RUN useradd -m foo
-USER foo:kasmvnc-cert
-
-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
--- a/builder/dockerfile.oracle_9.build
+++ b/builder/dockerfile.oracle_9.build
@ -1,63 +0,0 @@
-FROM oraclelinux:9
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 9
-ENV XORG_VER 1.20.11
-
-# Install from stock repos
-RUN \
-  dnf config-manager --set-enabled ol9_codeready_builder && \
-  dnf config-manager --set-enabled ol9_distro_builder && \
-  dnf install -y \
-    bzip2-devel \
-    ca-certificates \
-    cmake \
-    dnf-plugins-core \
-    gcc \
-    gcc-c++ \
-    git \
-    gnutls-devel \
-    libjpeg-turbo-devel \
-    libpng-devel \
-    libtiff-devel \
-    libxshmfence-devel \
-    make \
-    mesa-dri-drivers \
-    mesa-libGL-devel \
-    mesa-libgbm-devel \
-    openssl-devel \
-    openssl-devel \
-    patch \
-    tigervnc-server \
-    wget \
-    xorg-x11-font-utils \
-    zlib-devel
-
-# Enable additional repos (epel, powertools, and fusion)
-RUN dnf install -y oracle-epel-release-el9
-RUN dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-9.noarch.rpm
-
-# Install from new repos
-RUN dnf install -y \
-  giflib-devel \
-  lbzip2 \
-  libXfont2-devel \
-  libxkbfile-devel \
-  xorg-x11-server-devel \
-  xorg-x11-xtrans-devel \
-  libXrandr-devel \
-  libXtst-devel \
-  libXcursor-devel
-
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.oracle_9.rpm.build
+++ b/builder/dockerfile.oracle_9.rpm.build
@ -1,23 +0,0 @@
-FROM oraclelinux:9
-
-ENV KASMVNC_BUILD_OS oracle
-ENV KASMVNC_BUILD_OS_CODENAME 9
-
-RUN dnf config-manager --set-enabled ol9_codeready_builder
-RUN dnf config-manager --nobest --set-enabled ol9_distro_builder
-RUN dnf install --nobest -y \
-  gpg* \
-  less \
-  redhat-lsb-core \
-  rng-tools \
-  rpm* \
-  rpmlint \
-  rsync \
-  tree \
-  vim
-
-COPY oracle/kasmvncserver9.spec /tmp
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-USER docker
--- a/builder/dockerfile.ubuntu1604.build
+++ b/builder/dockerfile.ubuntu1604.build
@ -0,0 +1,21 @@
+FROM ubuntu:16.04
+
+RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list
+
+RUN apt-get update && \
+      apt-get -y install sudo
+
+RUN apt-get -y build-dep xorg-server
+RUN apt-get -y install cmake git libjpeg-dev libgnutls-dev vim wget tightvncserver
+RUN apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzvf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && ./configure && make && make install
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+
+COPY --chown=docker:docker . /src/
+
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.build
+++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.build
@ -0,0 +1,39 @@
+FROM ubuntu:18.04
+
+ENV KASMVNC_BUILD_OS ubuntu
+ENV KASMVNC_BUILD_OS_CODENAME bionic
+ENV XORG_VER 1.20.10
+
+RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list
+
+RUN apt-get update && \
+      apt-get -y install sudo
+
+RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
+RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+
+RUN apt-get update && apt-get install -y cmake nasm gcc
+RUN git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git
+RUN export MAKEFLAGS=-j`nproc`; cd libjpeg-turbo && cmake -G"Unix Makefiles" && make deb
+RUN export MAKEFLAGS=-j`nproc`; cd libjpeg-turbo && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -G"Unix Makefiles" && make && make install
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install
+
+# Fix for older required libs
+#RUN cd /tmp && wget http://launchpadlibrarian.net/347526424/libxfont1-dev_1.5.2-4ubuntu2_amd64.deb && \
+#    wget http://launchpadlibrarian.net/347526425/libxfont1_1.5.2-4ubuntu2_amd64.deb && \
+#    dpkg -i libxfont1_1.5.2-4ubuntu2_amd64.deb && \
+#    dpkg -i libxfont1-dev_1.5.2-4ubuntu2_amd64.deb
+
+RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+
+COPY --chown=docker:docker . /src
+
+USER docker
+ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build
+++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build
@ -1,14 +1,18 @@
-FROM ubuntu:jammy
-
-ENV DEBIAN_FRONTEND noninteractive
+FROM ubuntu:bionic

 RUN apt-get update && \
      apt-get -y install vim build-essential devscripts equivs

+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo*deb /tmp
+RUN apt-get install /tmp/libjpeg-turbo*deb
+
 # Install build-deps for the package.
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control

+ENV LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH"
+
 ARG L_UID
 RUN if [ "$L_UID" -eq 0 ]; then \
      useradd -m docker; \
--- a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test
+++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test
@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:bionic

 ENV DISPLAY=:1 \
    VNC_PORT=8443 \
@ -16,7 +16,7 @@ ENV DISPLAY=:1 \
    VNC_PW=vncpassword \
    VNC_USER=user \
    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 \
    SINGLE_APPLICATION=0 \
@ -37,16 +37,17 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install
+COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo_*.deb /tmp
+RUN apt-get install /tmp/libjpeg-turbo*deb

-RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \
-  chmod +x ~/.vnc/xstartup
+ARG BUILD_DEBIAN_REVISION
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*$BUILD_DEBIAN_REVISION*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.ubuntu_bionic.build
+++ b/builder/dockerfile.ubuntu_bionic.build
@ -10,13 +10,15 @@ RUN apt-get update && \
      apt-get -y install sudo

 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 # Fix for older required libs
 #RUN cd /tmp && wget http://launchpadlibrarian.net/347526424/libxfont1-dev_1.5.2-4ubuntu2_amd64.deb && \
--- a/builder/dockerfile.ubuntu_bionic.deb.test
+++ b/builder/dockerfile.ubuntu_bionic.deb.test
@ -37,16 +37,13 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install

 ### END CUSTOM STUFF ###

--- a/builder/dockerfile.ubuntu_bionic.test
+++ b/builder/dockerfile.ubuntu_bionic.test
@ -29,13 +29,13 @@ WORKDIR $HOME

 ### REQUIRED STUFF ###

-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext libjpeg-dev wget
 RUN apt-get purge -y pm-utils xscreensaver*

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

--- a/builder/dockerfile.ubuntu_focal.barebones.deb.test
+++ b/builder/dockerfile.ubuntu_focal.barebones.deb.test
@ -1,20 +1,15 @@
 FROM ubuntu:focal

-ENV STARTUPDIR=/dockerstartup
-
-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
-
+RUN rm -f /tmp/kasmvncserver_*+*.deb; apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
 RUN apt-get update && apt-get -y install xterm lsb-release

-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/vnc_startup_barebones.sh $STARTUPDIR
-
 RUN useradd -m foo && addgroup foo ssl-cert
+
 USER foo

-ENTRYPOINT "/$STARTUPDIR/vnc_startup_barebones.sh"
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+
+ENTRYPOINT bash -c "echo -e \"$VNC_PW\n$VNC_PW\n\" | kasmvncpasswd -w -u \"$VNC_USER\" && vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/ssl/certs/ssl-cert-snakeoil.pem -key /etc/ssl/private/ssl-cert-snakeoil.key -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
--- a/builder/dockerfile.ubuntu_focal.build
+++ b/builder/dockerfile.ubuntu_focal.build
@ -12,13 +12,15 @@ RUN apt-get update && \

 RUN apt-get update && apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git vim wget curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN apt-get update && apt-get -y install cmake git libjpeg-dev libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install libjpeg-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
+
+# Additions for webp
+RUN cd /tmp && wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
+RUN cd /tmp && tar -xzf /tmp/libwebp-*
+RUN cd /tmp/libwebp-1.0.2 && \
+    ./configure --enable-static --disable-shared && \
+    make && make install

 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo

--- a/builder/dockerfile.ubuntu_focal.deb.test
+++ b/builder/dockerfile.ubuntu_focal.deb.test
@ -37,16 +37,13 @@ RUN apt-get update && apt-get -y install lsb-release
 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install

 RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \
  chmod +x ~/.vnc/xstartup
--- a/builder/dockerfile.ubuntu_focal.specs.test
+++ b/builder/dockerfile.ubuntu_focal.specs.test
@ -1,30 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get update && apt-get install -y python3-pip
-RUN apt-get update && apt-get install -y strace silversearcher-ag xfonts-base
-RUN apt-get update && apt-get install -y cinnamon
-RUN apt-get update && apt-get install -y mate
-
-RUN useradd -m docker
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN apt-get install -y /tmp/*$(dpkg --print-architecture).deb
-
-ENV USER docker
-ENV HOME /home/docker
-
-RUN chown -R 1000:0 $HOME
-USER 1000:ssl-cert
-WORKDIR $HOME
-
-RUN pip3 install --user pipenv
-RUN echo 'PATH="~/.local/bin/:$PATH"' >> ~/.bashrc
-
-ENV LC_ALL=C.UTF-8
-ENV LANG=C.UTF-8
-
-ENTRYPOINT ["/bin/bash", "-ic", "/src/builder/run-specs-inside-docker"]
--- a/builder/dockerfile.ubuntu_focal.test
+++ b/builder/dockerfile.ubuntu_focal.test
@ -29,13 +29,13 @@ WORKDIR $HOME

 ### REQUIRED STUFF ###

-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
+RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext libjpeg-dev wget
 RUN apt-get purge -y pm-utils xscreensaver*

 RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc

 RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
+COPY startup/ $STARTUPDIR

 ### START CUSTOM STUFF ####

--- a/builder/dockerfile.ubuntu_focal.vncserver_devenv.test
+++ b/builder/dockerfile.ubuntu_focal.vncserver_devenv.test
@ -18,28 +18,22 @@ RUN apt-get update && apt-get -y install net-tools
 RUN apt-get update && apt-get install -y ubuntu-mate-desktop
 RUN apt-get update && apt-get install -y lxde
 RUN apt-get update && apt-get install -y lxqt
-RUN apt-get update && apt-get install -y kde-plasma-desktop
+RUN apt-get update && apt-get install -y kde-full
 RUN apt-get update && apt-get install -y cinnamon
-RUN apt-get update && apt-get install -y gnome-session
+RUN apt-get update && apt-get install -y ubuntu-gnome-desktop
 RUN apt-get purge -y pm-utils xscreensaver*
 RUN apt-get purge -y clipit magnus kgpg

 RUN apt-get update && apt-get install -y python3-pip
 RUN apt-get update && apt-get install -y strace
-RUN apt-get update && apt-get install -y silversearcher-ag
-RUN apt-get update && apt-get install -y libdevel-stacktrace-perl

 RUN useradd -m docker
 ENV USER docker

-COPY ./builder/scripts/ /tmp/scripts/
-COPY ./debian/changelog /tmp
-
 ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN /tmp/scripts/install_kasmvncserver_package
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN dpkg -i /tmp/*.deb; apt-get -yf install

-ENV KASMVNC_DEVELOPMENT 1
 ENV HOME /home/docker
 RUN chown -R 1000:0 $HOME
 USER 1000:ssl-cert
@ -47,20 +41,12 @@ WORKDIR $HOME

 RUN pip3 install --user pipenv
 RUN echo 'PATH="/src/unix:~/.local/bin/:$PATH"' >> ~/.bashrc
-RUN echo 'export PERL5LIB="/src/unix"' >> ~/.bashrc
-RUN echo 'ulimit -c 0' >> ~/.bashrc
-RUN echo 'alias s="vncserver"' >> ~/.bashrc
+RUN echo 'alias s="sh /src/s"' >> ~/.bashrc
 RUN echo 'alias k="vncserver -kill :1; pkill baloo_file; pkill gpg-agent; pkill ssh-agent; pkill xiccd"' >> ~/.bashrc
 RUN echo 'alias r="k; s"' >> ~/.bashrc
-RUN echo 'alias go="vncserver; vncserver -kill :1"' >> ~/.bashrc
-RUN echo 'alias ns="netstat -nltup"' >> ~/.bashrc
-RUN echo 'alias tv="./run-specs spec/vncserver_yaml_validation_spec.py"' >> ~/.bashrc
-RUN echo 'alias ty="./run-specs spec/vncserver_*spec.py"' >> ~/.bashrc
-RUN echo 'alias ta="./run-specs"' >> ~/.bashrc
-RUN echo 'alias vd="vncserver -dry-run"' >> ~/.bashrc
-RUN echo 'alias ss="sp; vncserver -select-de xfce"' >> ~/.bashrc
-ENV SET_PASSWORD_FUNC 'sp() { echo -e "$VNC_PW\\n$VNC_PW\\n" | kasmvncpasswd -w -u $VNC_USER $HOME/.kasmpasswd; }'
-RUN echo $SET_PASSWORD_FUNC >> ~/.bashrc
+RUN echo 'alias go="sh /src/s; vncserver -kill :1"' >> ~/.bashrc
+RUN echo 'alias ns="netstat -nltp"' >> ~/.bashrc
+RUN echo 'alias mamba="pipenv run mamba spec/"' >> ~/.bashrc

 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
--- a/builder/dockerfile.ubuntu_jammy.build
+++ b/builder/dockerfile.ubuntu_jammy.build
@ -1,28 +0,0 @@
-FROM ubuntu:jammy
-
-ENV KASMVNC_BUILD_OS ubuntu
-ENV KASMVNC_BUILD_OS_CODENAME jammy
-ENV XORG_VER 21.1.3
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list
-
-RUN apt-get update && \
-      apt-get -y install sudo
-
-RUN apt-get update && apt-get install -y --no-install-recommends tzdata
-RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_jammy.test
+++ b/builder/dockerfile.ubuntu_jammy.test
@ -1,51 +0,0 @@
-FROM ubuntu:jammy
-
-ENV DISPLAY=:1 \
-    VNC_PORT=8443 \
-    VNC_RESOLUTION=1280x720 \
-    MAX_FRAME_RATE=24 \
-    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
-    HOME=/home/user \
-    TERM=xterm \
-    STARTUPDIR=/dockerstartup \
-    INST_SCRIPTS=/dockerstartup/install \
-    KASM_RX_HOME=/dockerstartup/kasmrx \
-    DEBIAN_FRONTEND=noninteractive \
-    VNC_COL_DEPTH=24 \
-    VNC_RESOLUTION=1280x1024 \
-    VNC_PW=vncpassword \
-    VNC_USER=user \
-    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/usr/local/lib/ \
-    OMP_WAIT_POLICY=PASSIVE \
-    SHELL=/bin/bash \
-    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=ubuntu \
-    KASMVNC_BUILD_OS_CODENAME=jammy
-
-EXPOSE $VNC_PORT
-
-WORKDIR $HOME
-
-### REQUIRED STUFF ###
-
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
-RUN apt-get purge -y pm-utils xscreensaver*
-
-RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/ $STARTUPDIR
-
-### START CUSTOM STUFF ####
-
-COPY build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz /tmp/
-RUN tar -xzvf /tmp/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz --strip 1 -C /
-
-### END CUSTOM STUFF ###
-
-RUN chown -R 1000:0 $HOME
-USER 1000
-WORKDIR $HOME
-
-ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.ubuntu_noble.build
+++ b/builder/dockerfile.ubuntu_noble.build
@ -1,28 +0,0 @@
-FROM ubuntu:noble
-
-ENV KASMVNC_BUILD_OS ubuntu
-ENV KASMVNC_BUILD_OS_CODENAME noble
-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
-
-RUN apt-get update && \
-      apt-get -y install sudo
-
-RUN apt-get update && apt-get install -y --no-install-recommends tzdata
-RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget curl
-RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
--- a/builder/dockerfile.ubuntu_noble.deb.build
+++ b/builder/dockerfile.ubuntu_noble.deb.build
@ -1,19 +0,0 @@
-FROM ubuntu:noble
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && \
-      apt-get -y install vim build-essential devscripts equivs
-
-# Install build-deps for the package.
-COPY ./debian/control /tmp
-RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
-
-ARG L_UID
-RUN if [ "$L_UID" -eq 0 ]; then \
-      useradd -m docker; \
-    else \
-      useradd -m docker -u $L_UID;\
-    fi
-
-USER docker
--- a/builder/dockerfile.ubuntu_noble.deb.test
+++ b/builder/dockerfile.ubuntu_noble.deb.test
@ -1,57 +0,0 @@
-FROM ubuntu:noble
-
-ENV DISPLAY=:1 \
-    VNC_PORT=8443 \
-    VNC_RESOLUTION=1280x720 \
-    MAX_FRAME_RATE=24 \
-    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
-    HOME=/home/user \
-    TERM=xterm \
-    STARTUPDIR=/dockerstartup \
-    INST_SCRIPTS=/dockerstartup/install \
-    KASM_RX_HOME=/dockerstartup/kasmrx \
-    DEBIAN_FRONTEND=noninteractive \
-    VNC_COL_DEPTH=24 \
-    VNC_RESOLUTION=1280x1024 \
-    VNC_PW=vncpassword \
-    VNC_USER=user \
-    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/usr/local/lib/ \
-    OMP_WAIT_POLICY=PASSIVE \
-    SHELL=/bin/bash \
-    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=ubuntu \
-    KASMVNC_BUILD_OS_CODENAME=noble
-
-EXPOSE $VNC_PORT
-
-WORKDIR $HOME
-
-### REQUIRED STUFF ###
-
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
-RUN apt-get purge -y pm-utils xscreensaver*
-RUN apt-get update && apt-get install -y vim less
-RUN apt-get update && apt-get -y install lsb-release
-
-RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
-
-RUN mkdir -p $STARTUPDIR
-COPY builder/startup/ $STARTUPDIR
-
-### START CUSTOM STUFF ####
-
-ARG KASMVNC_PACKAGE_DIR
-COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install
-
-RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \
-  chmod +x ~/.vnc/xstartup
-
-### END CUSTOM STUFF ###
-
-RUN chown -R 1000:0 $HOME
-USER 1000:ssl-cert
-WORKDIR $HOME
-
-ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/dockerfile.ubuntu_noble.test
+++ b/builder/dockerfile.ubuntu_noble.test
@ -1,51 +0,0 @@
-FROM ubuntu:noble
-
-ENV DISPLAY=:1 \
-    VNC_PORT=8443 \
-    VNC_RESOLUTION=1280x720 \
-    MAX_FRAME_RATE=24 \
-    VNCOPTIONS="-PreferBandwidth -DynamicQualityMin=4 -DynamicQualityMax=7" \
-    HOME=/home/user \
-    TERM=xterm \
-    STARTUPDIR=/dockerstartup \
-    INST_SCRIPTS=/dockerstartup/install \
-    KASM_RX_HOME=/dockerstartup/kasmrx \
-    DEBIAN_FRONTEND=noninteractive \
-    VNC_COL_DEPTH=24 \
-    VNC_RESOLUTION=1280x1024 \
-    VNC_PW=vncpassword \
-    VNC_USER=user \
-    VNC_VIEW_ONLY_PW=vncviewonlypassword \
-    LD_LIBRARY_PATH=/usr/local/lib/ \
-    OMP_WAIT_POLICY=PASSIVE \
-    SHELL=/bin/bash \
-    SINGLE_APPLICATION=0 \
-    KASMVNC_BUILD_OS=ubuntu \
-    KASMVNC_BUILD_OS_CODENAME=noble
-
-EXPOSE $VNC_PORT
-
-WORKDIR $HOME
-
-### REQUIRED STUFF ###
-
-RUN apt-get update && apt-get install -y supervisor xfce4 xfce4-terminal xterm libnss-wrapper gettext wget
-RUN apt-get purge -y pm-utils xscreensaver*
-
-RUN echo 'source $STARTUPDIR/generate_container_user' >> $HOME/.bashrc
-
-RUN mkdir -p $STARTUPDIR
-COPY startup/ $STARTUPDIR
-
-### START CUSTOM STUFF ####
-
-COPY build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz /tmp/
-RUN tar -xzvf /tmp/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz --strip 1 -C /
-
-### END CUSTOM STUFF ###
-
-RUN chown -R 1000:0 $HOME
-USER 1000
-WORKDIR $HOME
-
-ENTRYPOINT [ "/dockerstartup/vnc_startup.sh" ]
--- a/builder/os_ver_cli.sh
+++ b/builder/os_ver_cli.sh
@ -1,11 +1,9 @@
-#!/bin/bash
-
-default_os=${default_os:-ubuntu}
-default_os_codename=${default_os_codename:-bionic}
+default_os=ubuntu
+default_os_codename=bionic

 os=${1:-$default_os}
 os_codename=${2:-$default_os_codename}
-build_tag="$3"
+build_tag="${3:-}"
 if [[ -n "$build_tag" ]]; then
   build_tag_for_images="_${build_tag#+}"
   build_debian_revision="$(echo $build_tag | tr _ -)"
--- a/builder/process_test_options.sh
+++ b/builder/process_test_options.sh
@ -1,49 +0,0 @@
-#!/bin/bash
-
-usage() {
-  echo >&2 "Usage: $(basename "$0") [-s|--shell] [-p|--perf-test] [-h|--help] <distro> <distro_version>"
-  exit
-}
-
-process_options() {
-   local sorted_options=$(getopt -o psh --long perf-test --long shell --long help -- "$@")
-   eval set -- $sorted_options
-
-   while : ; do
-      case "$1" in
-         -p|--perf-test)
-            entrypoint_args='-interface 0.0.0.0 -selfBench :1'
-            entrypoint_executable="--entrypoint=/usr/bin/Xvnc"
-            shift
-            ;;
-         -s|--shell)
-            entrypoint_executable="--entrypoint=bash"
-            shift
-            ;;
-         -h|--help)
-            print_usage=1
-            ;;
-         --)
-            shift
-            break
-            ;;
-      esac
-   done
-
-   leftover_options=("$@")
-}
-
-declare -a leftover_options
-
-if [ "$#" -eq 0 ]; then
-   usage
-   exit
-fi
-
-process_options "$@"
-set -- "${leftover_options[@]}"
-
-if [ -n "$print_usage" ]; then
-   usage
-   exit
-fi
--- a/builder/run-specs-inside-docker
+++ b/builder/run-specs-inside-docker
@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-logfile=/tmp/specs.log
-red='\033[0;31m'
-no_color='\033[0m'
-
-fail_on_perl_warnings() {
-   if grep -qP 'line \d+\.$' "$logfile"; then
-      echo -e "${red}Failure: Perl warnings were found${no_color}"
-      false
-   fi
-}
-
-cd /src
-pipenv install
-./run-specs 2>&1 | tee "$logfile"
-fail_on_perl_warnings
--- a/builder/scripts/build-libjpeg-turbo
+++ b/builder/scripts/build-libjpeg-turbo
@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-build_and_install() {
-  export MAKEFLAGS=-j`nproc`
-  export CFLAGS="-fpic"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr/local -G"Unix Makefiles"
-  make
-  make install
-}
-
-install_build_dependencies() {
-  install_packages cmake gcc
-  ensure_libjpeg_is_fast
-}
-
-ensure_libjpeg_is_fast() {
-  install_packages nasm
-}
-
-prepare_libjpeg_source() {
-  export JPEG_TURBO_RELEASE=$(curl -sX GET "https://api.github.com/repos/libjpeg-turbo/libjpeg-turbo/releases/latest" \
-  | awk '/tag_name/{print $4;exit}' FS='[""]')
-  mkdir libjpeg-turbo
-  curl -Ls "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_TURBO_RELEASE}.tar.gz" | \
-  tar xzvf - -C libjpeg-turbo/ --strip-components=1
-  cd libjpeg-turbo
-}
-
-source_dir=$(dirname "$0")
-. "$source_dir/common.sh"
-
-install_build_dependencies
-prepare_libjpeg_source
-build_and_install
--- a/builder/scripts/build-webp
+++ b/builder/scripts/build-webp
@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-webp_tar_url=https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.4.tar.gz
-
-prepare_source() {
-  cd /tmp
-  wget "$webp_tar_url"
-  tar -xzf /tmp/libwebp-*
-  rm /tmp/libwebp-*.tar.gz
-  cd /tmp/libwebp-*
-}
-
-build_and_install() {
-  export MAKEFLAGS=-j`nproc`
-  ./configure --enable-static --disable-shared
-  make
-  make install
-}
-
-prepare_source
-build_and_install
--- a/builder/scripts/common.sh
+++ b/builder/scripts/common.sh
@ -1,34 +0,0 @@
-#!/bin/bash
-
-detect_distro() {
-  if [ -f /etc/centos-release ]; then
-    DISTRO=centos
-  elif [ -f /etc/oracle-release ]; then
-    DISTRO=oracle
-  elif [ -f /etc/fedora-release ]; then
-    DISTRO=fedora
-  elif [ -f /usr/bin/zypper ]; then
-    DISTRO=opensuse
-  elif [ -f /etc/alpine-release ]; then
-    DISTRO=alpine
-  else
-    DISTRO=debian
-  fi
-}
-
-install_packages() {
-  local install_cmd=no-command-defined
-
-  case "$DISTRO" in
-    centos) install_cmd="yum install -y" ;;
-    oracle) install_cmd="dnf install -y" ;;
-    fedora) install_cmd="dnf install -y" ;;
-    opensuse) install_cmd="zypper install -y" ;;
-    alpine) install_cmd="apk add" ;;
-    *) install_cmd="apt-get update && apt-get install -y"
-  esac
-
-  eval "$install_cmd $*"
-}
-
-detect_distro
--- a/builder/scripts/install_kasmvncserver_package
+++ b/builder/scripts/install_kasmvncserver_package
@ -1,64 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ -n "$1" ]]; then
-  tag="$1"
-fi
-
-is_debian() {
-  [[ -f /etc/debian_version ]]
-}
-
-check_package_version_exists() {
-  if ! stat /tmp/kasmvncserver_"$package_version"*.deb; then
-    >&2 echo "No package found for version $package_version"
-    exit 1
-  fi
-}
-
-remove_tagged_debs_unless_tag_used() {
-  if [[ -n "$tag" ]]; then
-    return
-  fi
-
-  rm -f /tmp/kasmvncserver_*+*.deb
-}
-
-detect_rpm_package_manager() {
-  if command -v dnf >/dev/null; then
-    rpm_package_manager=dnf
-  else
-    rpm_package_manager=yum
-  fi
-}
-
-install_package_built_for_current_branch_package_version_deb() {
-  remove_tagged_debs_unless_tag_used
-
-  apt-get update
-  apt-get install -y dpkg-dev
-  package_version=$(dpkg-parsechangelog --show-field Version \
-    --file /tmp/changelog)
-
-  check_package_version_exists
-  apt-get install -y /tmp/kasmvncserver_"$package_version"*"$tag"*.deb
-}
-
-install_package_built_for_current_branch_package_version_rpm() {
-  detect_rpm_package_manager
-  $rpm_package_manager install -y rpmdevtools
-
-  package_version=$(rpmspec -q --qf '%{version}\n' /tmp/kasmvncserver.spec 2>/dev/null)
-  if [[ $rpm_package_manager = "dnf" ]]; then
-    dnf localinstall -y --allowerasing /tmp/kasmvncserver-"$package_version"*.rpm
-  else
-    yum install -y /tmp/kasmvncserver-"$package_version"*.rpm
-  fi
-}
-
-if is_debian ; then
-  install_package_built_for_current_branch_package_version_deb
-else
-  install_package_built_for_current_branch_package_version_rpm
-fi
--- a/builder/startup/deb/select-de.sh
+++ b/builder/startup/deb/select-de.sh
@ -68,10 +68,9 @@ add_uppercase_desktop_environment_keys() {
  done
 }

-manual_xstartup_choice="Manually edit xstartup"
-
 process_cli_options "$@"

+manual_xstartup_choice="Manually edit xstartup"
 declare -A all_desktop_environments=(
  [Cinnamon]="exec cinnamon-session"
  [Mate]="XDG_CURRENT_DESKTOP=MATE exec dbus-launch --exit-with-session mate-session"
@ -122,9 +121,6 @@ ask_user_to_choose_de() {
  while : ; do
    print_detected_desktop_environments
    read -r de_number_to_run
-    if [[ -z "$de_number_to_run" ]]; then
-      continue
-    fi
    de_name_from_number "$de_number_to_run"
    if [[ -n "$de_name" ]]; then
      break;
@ -198,7 +194,6 @@ generate_xstartup() {

  cat <<-SCRIPT > "$xstartup_script"
 #!/bin/sh
-set -x
 $de_cmd
 SCRIPT
  chmod +x "$xstartup_script"
@ -214,10 +209,6 @@ user_specified_de() {

 check_de_name_is_valid() {
  local selected_de="$1"
-  if [[ "$selected_de" = "$manual_xstartup_choice" ]]; then
-    return 0;
-  fi
-
  local de_cmd=${all_desktop_environments["${selected_de^^}"]:-}
  if [ -z "$de_cmd" ]; then
    echo >&2 "'$selected_de': not supported Desktop Environment"
--- a/builder/startup/vnc_startup.sh
+++ b/builder/startup/vnc_startup.sh
@ -12,6 +12,28 @@ cleanup () {
 }
 trap cleanup SIGINT SIGTERM

+detect_www_dir() {
+  local package_www_dir="/usr/share/kasmvnc/www"
+  if [[ -d "$package_www_dir" ]]; then
+    package_www_dir_option="-httpd $package_www_dir"
+  fi
+}
+
+detect_cert_location() {
+  local tarball_cert="$HOME/.vnc/self.pem"
+  local deb_cert="/etc/ssl/certs/ssl-cert-snakeoil.pem"
+  local deb_key="/etc/ssl/private/ssl-cert-snakeoil.key"
+  local rpm_cert="/etc/pki/tls/private/kasmvnc.pem"
+
+  if [[ -f "$deb_cert" ]]; then
+    cert_option="-cert $deb_cert -key $deb_key"
+  elif [[ -f "$rpm_cert" ]]; then
+    cert_option="-cert $rpm_cert"
+  else
+    cert_option="-cert $tarball_cert"
+  fi
+}
+
 add_vnc_user() {
  local username="$1"
  local password="$2"
@ -59,10 +81,12 @@ vncserver -kill $DISPLAY &> $HOME/.vnc/vnc_startup.log \
    || echo "no locks present"


+detect_www_dir
+detect_cert_location
 [ -n "$KASMVNC_VERBOSE_LOGGING" ] && verbose_logging_option="-debug"

 echo -e "start vncserver with param: VNC_COL_DEPTH=$VNC_COL_DEPTH, VNC_RESOLUTION=$VNC_RESOLUTION\n..."
-vncserver $DISPLAY -select-de xfce -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -FrameRate=$MAX_FRAME_RATE -websocketPort $VNC_PORT $VNCOPTIONS $verbose_logging_option #&> $STARTUPDIR/no_vnc_startup.log
+vncserver $DISPLAY -select-de xfce -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -FrameRate=$MAX_FRAME_RATE -websocketPort $VNC_PORT $cert_option -sslOnly -interface 0.0.0.0 $VNCOPTIONS $package_www_dir_option $verbose_logging_option #&> $STARTUPDIR/no_vnc_startup.log

 PID_SUN=$!

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dmitry Maksyoma	d94b30c2fa	Specs: improve spec runner	4 years ago
Dmitry Maksyoma	8e040e58a1	Specs: extract spec_helper.py	4 years ago
Dmitry Maksyoma	c0229f8470	Specs: improve run-specs(1)	4 years ago
Dmitry Maksyoma	dcccd1d1f2	YAML config improvements	4 years ago
Dmitry Maksyoma	c2f302cdc6	YAML config: add websocket_port	4 years ago
Dmitry Maksyoma	becfa90a2c	vncserver: update /etc YAML config	4 years ago
Dmitry Maksyoma	e5233f27bd	YAML config: improve config structure and keys	4 years ago
Dmitry Maksyoma	377269129c	vncserver: YAML config draft	4 years ago
Dmitry Maksyoma	8ea6704fcd	vncserver: add -dry-run option	4 years ago
Dmitry Maksyoma	a9888b9ca7	Flesh out YAML config spike	4 years ago
Dmitry Maksyoma	71b3515d6c	vncserver test env: fix r alias	4 years ago
Dmitry Maksyoma	b1ee23dc62	Update kasmweb to be the same as master	4 years ago
Dmitry Maksyoma	a675f411cc	vncserver test env: kill leftover processes on "k" command	4 years ago
Dmitry Maksyoma	35e0157431	vncserver test env: remove unnecessary packages	4 years ago
Dmitry Maksyoma	6fa5b9271f	Merge branch 'master' into KASM-1810_yaml_config	4 years ago
Dmitry Maksyoma	e4ad356c7d	vncserver dev env: no screensaver	4 years ago
Dmitry Maksyoma	f79c3b3b11	YAML config WIP	4 years ago
Dmitry Maksyoma	8e96d4cac5	vncserver dev env: add aliases to start/kill/restart Xvnc	4 years ago
Dmitry Maksyoma	ab4642aa87	vncserver: fix default config	4 years ago
Dmitry Maksyoma	7ad6810d7f	vncserver YAML config: support true and false values	4 years ago
Dmitry Maksyoma	42021dd29a	vncserver: YAML config spike	4 years ago
Dmitry Maksyoma	11d3958702	Deb/Rpm: add List::Util dependency	4 years ago
Dmitry Maksyoma	27f0ed29ca	vncserver: fix case of -websocketPort not specified	4 years ago
Dmitry Maksyoma	628033af45	Deb/Rpm: set package versions to 0.9.3~beta	4 years ago
Dmitry Maksyoma	3fac7c4947	Refactor vnc_startup.sh	4 years ago
Dmitry Maksyoma	2ecf9a25ed	vnc_startup.sh: select XFCE by default	4 years ago
Dmitry Maksyoma	a4a8d3aad5	vnc_startup.sh: remove temporary hack	4 years ago
Dmitry Maksyoma	d6132154fb	vncserver test image: Python specs require a newer Python Newer Python is available in Ubuntu Focal.	4 years ago
Dmitry Maksyoma	219e2c5cb1	Don't check www.x.org certificate for now (wget)	4 years ago
Dmitry Maksyoma	7cced9dd05	vncserver: fix -websocketPort being ignored	4 years ago
Dmitry Maksyoma	f3681c87f9	vncserver: fix -debug	4 years ago
Dmitry Maksyoma	303fde284e	vncserver: fix display :0 being ignored on CLI	4 years ago
Dmitry Maksyoma	8cd49ebbf8	vncserver: fix heredoc to work on CentOS	4 years ago
Dmitry Maksyoma	bc2e2512e3	vncserver: YAML config spike	4 years ago
Dmitry Maksyoma	aefbb4d143	vncserver: update comment	4 years ago
Dmitry Maksyoma	b34fe08786	vncserver refactor: use standard way of calling functions For somebody coming from Python/Ruby/JavaScript, foo() is easier to understand than &foo. Also, less noise.	4 years ago
Dmitry Maksyoma	ee3b7f9aa5	vncserver: add easy -debug option to pass -log to Xvnc	4 years ago
Dmitry Maksyoma	f7254e9708	vncserver: fix -select-de	4 years ago
Dmitry Maksyoma	e3a41bc055	vncserver: use IP when printing browser url	4 years ago
Dmitry Maksyoma	1bda8ab452	Specs: add comments	4 years ago
Dmitry Maksyoma	02ef620f67	vncserver: print browser url to connect to Add 0.0.0.0 as default interface. Xvnc fails if -interface isn't passed.	4 years ago
Dmitry Maksyoma	e453c7d73b	vncserver: swallow -interface and pass through to Xvnc	4 years ago
Dmitry Maksyoma	ca42870585	Specs: refactor	4 years ago
Dmitry Maksyoma	0b53e9f0a6	Specs: extract start_xvnc_pexpect()	4 years ago
Dmitry Maksyoma	3f69b7bd33	Specs: extract clean_kasm_users()	4 years ago
Dmitry Maksyoma	4cb75459ed	Specs: run vncserver with debug on	4 years ago
Dmitry Maksyoma	8a424a0463	Update README	4 years ago
Dmitry Maksyoma	a9d85aa99b	Update README	4 years ago
Dmitry Maksyoma	cca1dabb71	Update README	4 years ago
Dmitry Maksyoma	183917d046	Update README	4 years ago
Dmitry Maksyoma	a31601de9a	Update README	4 years ago
Dmitry Maksyoma	e21366cc7b	Update README	4 years ago
Dmitry Maksyoma	76a5b18748	vncserver: remove obsolete code	4 years ago
Dmitry Maksyoma	04379056af	vncserver: refactor	4 years ago
Dmitry Maksyoma	49908e1867	vncserver: detect select-de.sh location	4 years ago
Dmitry Maksyoma	df4a5ac910	Put select-de.sh in /usr/lib	4 years ago
Dmitry Maksyoma	606075ddc0	vncserver: refactor	4 years ago
Dmitry Maksyoma	17fa6911c1	vncserver: extract IsDebian()	4 years ago
Dmitry Maksyoma	5f7d3ad43a	Specs: pexpect starts Xvnc now	4 years ago
Dmitry Maksyoma	f857d47ccf	vncserver: fix generated xstartup indentation	4 years ago
Dmitry Maksyoma	3b3c8d0881	vncserver: refactor	4 years ago
Dmitry Maksyoma	fe3569c6e8	vncserver: check user is in ssl-cert group on Debian-based distros	4 years ago
Dmitry Maksyoma	90d9cbe65b	Specs: WIP	4 years ago
Dmitry Maksyoma	f0e63b2e3d	Specs: require Python 3.8	4 years ago
Dmitry Maksyoma	b5eaf71248	Specs: unfocus tests	4 years ago
Dmitry Maksyoma	e643cf4115	Specs: improve test	4 years ago
Dmitry Maksyoma	df35fadc9b	Specs: test specifying custom user name for guided user creation	4 years ago
Dmitry Maksyoma	a27ad89677	Spec: add user creation test	4 years ago
Dmitry Maksyoma	04e93956b5	vncserver test image: add strace	4 years ago
Dmitry Maksyoma	5de1b80ca7	Spec refactoring	4 years ago
Dmitry Maksyoma	d3e209c9ba	vncserver test image based on Ubuntu Focal	4 years ago
Dmitry Maksyoma	ff8ab63aab	Spec: extract start_xvnc(), kill only if running	4 years ago
Dmitry Maksyoma	a51444257a	Spec: no overwrite is possible on the first run	4 years ago
Dmitry Maksyoma	e23e5cc63b	Spec refactoring	4 years ago
Dmitry Maksyoma	043438e2e0	Spec: vncserver 2nd run tests	4 years ago
Dmitry Maksyoma	8152596519	Spec refactoring	4 years ago
Dmitry Maksyoma	fe2bd6c6d6	Specs: extract select_de()	4 years ago
Dmitry Maksyoma	5d0e8b1b03	Spec refactoring	4 years ago
Dmitry Maksyoma	9faf87389f	vncserver: no xstartup overwrite confirmation if it doesn't exist	4 years ago
Dmitry Maksyoma	ec948ab20f	Spec refactoring	4 years ago
Dmitry Maksyoma	2fa381a3fe	Spec add "first run" test	4 years ago
Dmitry Maksyoma	9161015aca	Spec refactoring	4 years ago
Dmitry Maksyoma	3fe52a84ba	Spec refactoring	4 years ago
Dmitry Maksyoma	0c26c4cb85	Specs: fix file/dir removal	4 years ago
Dmitry Maksyoma	177da18fc8	vncserver: update Bionic image	4 years ago
Dmitry Maksyoma	0b495fd3f9	Specs: clean environment before each test	4 years ago
Dmitry Maksyoma	0011fa6afd	Specs: extract check_de_was_setup_to_run()	4 years ago
Dmitry Maksyoma	ed78c9dcc5	Specs: extract kill_xvnc()	4 years ago
Dmitry Maksyoma	dca392eafd	Specs: extract add_kasmvnc_user_docker()	4 years ago
Dmitry Maksyoma	28c06893e3	Specs: add -select-de test spike	4 years ago
Dmitry Maksyoma	0f23baa647	Specs: run_cmd() add **kwargs	4 years ago
Dmitry Maksyoma	d1f0d6f7e7	Spec refactoring	4 years ago
Dmitry Maksyoma	d522457723	Add spec runner	4 years ago
Dmitry Maksyoma	d8bbb9884d	vncserver: spec creates password file	4 years ago
Dmitry Maksyoma	7cb1ea9ebc	vncserver: Python spec spike	4 years ago
Dmitry Maksyoma	dbd54fe35c	vncserver: add -select-de	4 years ago
Dmitry Maksyoma	6287114cbf	Merge branch 'master' into KASM-1609_select_de_to_run	4 years ago
Dmitry Maksyoma	f999acc490	vncserver: extract ForgetSelectedDe()	4 years ago
Dmitry Maksyoma	71c420fc86	Deb/Rpm: add Perl Switch dependency	4 years ago
Dmitry Maksyoma	f766c3a8c0	Fix test-vncserver	4 years ago
Dmitry Maksyoma	c96d38bbe5	select-de.sh: refactor	4 years ago
Dmitry Maksyoma	c2a5876127	select-de.sh: use exec with XFCE	4 years ago
Dmitry Maksyoma	64c190e2bb	select-de.sh: fix -s <DE>	4 years ago
Dmitry Maksyoma	4ed2c57ce3	select-de.sh: fix MATE DE	4 years ago
Dmitry Maksyoma	3a528b94e6	select-de.sh: -s supports mangled DE names like CiNnAmOn	4 years ago
Dmitry Maksyoma	fbdda196b8	select-de.sh: make -s <DE> work	4 years ago
Dmitry Maksyoma	75b42e4f3f	select-de.sh: assume -y if -s <DE> was given	4 years ago
Dmitry Maksyoma	003958dd9f	select-de.sh: fix -s	4 years ago
Dmitry Maksyoma	69a9ba66cd	vncserver test env: install MATE	4 years ago
Dmitry Maksyoma	279e91dcb1	select-de.sh: add -y, --assume-yes option	4 years ago
Dmitry Maksyoma	102d9b9a6c	Merge branch 'master' into KASM-1609_select_de_to_run	4 years ago
Dmitry Maksyoma	3eb1ffd94b	vncserver: -select-de spike	4 years ago
Dmitry Maksyoma	551f292144	vncserver: CLI optional option arg support (-select-de=[DE])	4 years ago
Dmitry Maksyoma	36ffbe1572	test-vncserver: ns alias for netstat -nltp	4 years ago
Dmitry Maksyoma	c775f7198b	select-de.sh: process --select-de with arg spike	4 years ago
Dmitry Maksyoma	0fa98100f8	select-de.sh: process --select-de spike	4 years ago
Dmitry Maksyoma	b0ffc6a27e	vncserver: use unique -websocketPort for each display	4 years ago
Dmitry Maksyoma	fa7b3492da	test-vncserver: export port for display :2	4 years ago
Dmitry Maksyoma	4a4e1d65b8	vncserver: Dockerfile and script for testing	4 years ago
Dmitry Maksyoma	cb08058d34	vncserver: print empty line before guided user creation	4 years ago
Dmitry Maksyoma	b4612d548f	Merge branch 'master' into KASM-1609_select_de_to_run	4 years ago
Dmitry Maksyoma	d0fe229684	vncserver: refactor	4 years ago
Dmitry Maksyoma	ded3840f6b	vncserver: extract PrintLogFilenameAndConfiguredUsersAndStuff()	4 years ago
Dmitry Maksyoma	c6f7d2eff0	vncserver: refactor	4 years ago
Dmitry Maksyoma	7e854294a2	vncserver: refactor	4 years ago
Dmitry Maksyoma	5635096978	vncserver: refactor	4 years ago
Dmitry Maksyoma	34565c5950	vncserver: extract AllowXProgramsToConnectToXvnc()	4 years ago
Dmitry Maksyoma	3522000d1f	vncserver: extract PrepareLoggingAndXvncKillingFramework()	4 years ago
Dmitry Maksyoma	3f23bddb6b	vncserver: refactor	4 years ago
Dmitry Maksyoma	b350557afd	vncserver: refactor	4 years ago
Dmitry Maksyoma	7dc12ccb8a	vncserver: refactor	4 years ago
Dmitry Maksyoma	f187aa9540	vncserver: remove obsolete code	4 years ago
Dmitry Maksyoma	79a21347f1	vncserver: extract DefineLogAndPidFilesForDisplayNumber()	4 years ago
Dmitry Maksyoma	0c1423f0b1	vncserver: remove obsolete code	4 years ago
Dmitry Maksyoma	1e21e09754	vncserver: remove obsolete code	4 years ago
Dmitry Maksyoma	6e0d272946	vncserver: enable "say"	4 years ago
Dmitry Maksyoma	c64e83732d	vncserver: fix indentation	4 years ago
Dmitry Maksyoma	acb9793841	vncserver: refactor	4 years ago
Dmitry Maksyoma	9a6ea64e0f	vncserver: refactor	4 years ago
Dmitry Maksyoma	68554d84d6	vncserver: refactor	4 years ago
Dmitry Maksyoma	ac51bd1d57	vncserver: refactor	4 years ago
Dmitry Maksyoma	3ef297a7cd	vncserver: refactor	4 years ago
Dmitry Maksyoma	0ca46888a0	vncserver: replace -kill sleep with a faster busyloop	4 years ago
Dmitry Maksyoma	8ca36e349e	vncserver: extract StartXvncOrExit()	4 years ago
Dmitry Maksyoma	cc90fe9ff6	vncserver: slice start time from 3 seconds to ~170ms	4 years ago
Dmitry Maksyoma	2b4f01f5ae	vncserver: extract EnsureAtLeastOneKasmUserExists()	4 years ago
Dmitry Maksyoma	65f957695e	vncserver: extract DeleteLogLeftFromPreviousXvncRun()	4 years ago
Dmitry Maksyoma	06e9e92ee1	vncserver: refactor	4 years ago
Dmitry Maksyoma	13f4ce0fba	vncserver: refactor	4 years ago
Dmitry Maksyoma	349a33e402	vncserver: refactor	4 years ago
Dmitry Maksyoma	a44241971e	vncserver: extract PrepareDefaultsForPassingToXvnc()	4 years ago
Dmitry Maksyoma	b26a20d44d	vncserver: refactor	4 years ago
Dmitry Maksyoma	f15aae2db8	vncserver: refactor	4 years ago
Dmitry Maksyoma	895f8bc10d	vncserver: refactor	4 years ago
Dmitry Maksyoma	649868241c	vncserver: refactor	4 years ago
Dmitry Maksyoma	8a3cf76f82	vncserver: refactor	4 years ago
Dmitry Maksyoma	cfac63aec5	vncserver: refactor	4 years ago
Dmitry Maksyoma	59f990b372	vncserver: extract ParseAndProcessCliOptions()	4 years ago
Dmitry Maksyoma	aa5fd48852	vncserver: extract SetGlobalVariables()	4 years ago
Dmitry Maksyoma	a2a748a582	vncserver: extract DetectEnvironment()	4 years ago
Dmitry Maksyoma	5f3fcddcde	vncserver: refactor	4 years ago
Dmitry Maksyoma	fa4308c542	vncserver: print user permissions	4 years ago
Dmitry Maksyoma	db2901e673	vncserver: print configured Kasm users	4 years ago
Dmitry Maksyoma	a0f09dea15	vncserver: refactor	4 years ago
Dmitry Maksyoma	21b42e462b	vncserver: extract CheckCliOptionsForBeingValid()	4 years ago
Dmitry Maksyoma	27f7f823fe	vncserver: fix DISPLAY detection	4 years ago
Dmitry Maksyoma	93d2c6c716	vncserver: guide user to create a KasmVNC user	4 years ago
Dmitry Maksyoma	fa342f624f	vncserver: extract AtLeastOneUserConfigured()	4 years ago
Dmitry Maksyoma	a6e9f94e27	vncserver: load .kasmpasswd users	4 years ago
Dmitry Maksyoma	ffb88ee8e6	vncserver: extract $kasmPasswdFile	4 years ago
Dmitry Maksyoma	c99d82fd8b	vncserver: refactor	4 years ago
Dmitry Maksyoma	69a2f9a13b	vncserver: extract CreateUserConfigIfNeeded()	4 years ago
Dmitry Maksyoma	08ede14dfe	vncserver: refactor	4 years ago
Dmitry Maksyoma	79c9c7157b	vncserver: remove obsolete comment	4 years ago
Dmitry Maksyoma	8f58d9bc92	vncserver: split IfXvncDidntStartTryFixingFontPathAndStartXvncAgain()	4 years ago
Dmitry Maksyoma	7ee1522143	vncserver: extract WaitForXvncToStart()	4 years ago
Dmitry Maksyoma	df5d3e506d	vncserver: extract WarnUserXvncNotStartedAndExit()	4 years ago
Dmitry Maksyoma	7954cc506c	vncserver: extract IsXvncRunning()	4 years ago
Dmitry Maksyoma	84764bac80	vncserver: refactor	4 years ago
Dmitry Maksyoma	bc54f75226	vncserver: extract IfXvncDidntStartTryFixingFontPathAndStartXvncAgain()	4 years ago
Dmitry Maksyoma	42eadfe784	vncserver: convert tabs -> spaces	4 years ago
Dmitry Maksyoma	1bea4d0a41	vncserver: extract StartXAndRecordPID()	4 years ago
Dmitry Maksyoma	6181c249d7	vncserver: extract ConstructXvncCmd()	4 years ago
Dmitry Maksyoma	4a63e93582	vncserver: extract SetupXauthorityFile() and others	4 years ago
Dmitry Maksyoma	f6667e99be	vncserver: remove obsolete code	4 years ago
Dmitry Maksyoma	d6fa4b55d7	vncserver: extract DisableVncAuth()	4 years ago
Dmitry Maksyoma	dc1850f1e7	vncserver: remove obsolete code	4 years ago
Dmitry Maksyoma	a6b3eb1f24	vncserver: extract LoadSystemThenUserThenMandatoryConfigs()	4 years ago
Dmitry Maksyoma	efbf401c8e	vncserver: refactor	4 years ago
Dmitry Maksyoma	c79da47c21	vncserver: extract DetectDisplayNumberFromCliArgs()	4 years ago
Dmitry Maksyoma	55525a627b	vncserver: fix formatting	4 years ago
Dmitry Maksyoma	c435e6ba7d	vncserver: refactor	4 years ago
Dmitry Maksyoma	59d53dbb19	vncserver: extract AskUserToChooseDeOrManualXstartup()	4 years ago
Dmitry Maksyoma	8da1612d4c	vncserver: extract CreateDotVncDir()	4 years ago
Dmitry Maksyoma	a560276817	vncserver: extract ProcessCliOptions()	4 years ago
Dmitry Maksyoma	2cb5098060	vncserver: extract DetectFontPath	4 years ago
Dmitry Maksyoma	ed51231b4e	vncserver: remove obsolete code	4 years ago
Dmitry Maksyoma	f903fd6c9d	vncserver: refactor	4 years ago
Dmitry Maksyoma	a3b9a96df7	vncserver: extract DetectUserName	4 years ago
Dmitry Maksyoma	5811e14b42	vncserver: extract DetectBinariesDir()	4 years ago
Dmitry Maksyoma	fc732f3603	vncserver: refactor	4 years ago
Dmitry Maksyoma	b330856d67	vncserver: improve readability	4 years ago
Dmitry Maksyoma	1165159180	vncserver: extract DetectDisplay() and RunXstartup()	4 years ago
Dmitry Maksyoma	25e761326f	vncserver: extract CreateXstartup()	4 years ago
Dmitry Maksyoma	53c545a9ad	vncserver: better test env detection	4 years ago
Dmitry Maksyoma	7c28908722	vncserver: ask to choose DE spike	4 years ago
Dmitry Maksyoma	6bdcbc32b1	vncserver: enable local testing It uses the dir it was ran from to find other binaries. If I run it locally as unix/vncserver, I want to use /usr/bin for other binaries.	4 years ago
Dmitry Maksyoma	fe736c8a2b	Easy start script: split shell code into modules	4 years ago
Dmitry Maksyoma	b13698eb56	Easy start script: code formatting	4 years ago
Dmitry Maksyoma	7941e10b0a	Easy start script: document --help in README	4 years ago
Dmitry Maksyoma	fc1aa63a44	Easy start script: use long GNU options -k, --kill, etc	4 years ago
Dmitry Maksyoma	1bd14fe881	Update xstartup modification documentation in README	4 years ago
Dmitry Maksyoma	8deac5cfa7	Easy start script: add -select-de to README	4 years ago
Dmitry Maksyoma	ba942e102e	Easy start script: remove obsolete code	4 years ago
Dmitry Maksyoma	c4cc856e56	Revert "vncserver: add magic text to signify that the file can be replaced" This reverts commit `b8fd6a28a4`.	4 years ago
Dmitry Maksyoma	7d842fe3d2	Easy start script: warn xstartup will be overwritten	4 years ago
Dmitry Maksyoma	7c4896ac66	Easy start script: refactor	4 years ago
Dmitry Maksyoma	24336b236a	Early start script: add -select-de support	4 years ago
Dmitry Maksyoma	8a11d171d5	Easy start script: fail if unsupported option is given	4 years ago
Dmitry Maksyoma	892c285963	Easy start script: refactor and correct option processing	4 years ago
Dmitry Maksyoma	26cc3845b0	Easy start script: sort DEs presented to user	4 years ago
Dmitry Maksyoma	f046e3340c	Easy start script: remember DE choice	4 years ago
Dmitry Maksyoma	bd144b71bf	Easy start script: add manual xstartup choice	4 years ago
Dmitry Maksyoma	66d999beaf	Refactor easy start script	4 years ago
Dmitry Maksyoma	3584d8c3cb	Refactor easy start script	4 years ago
Dmitry Maksyoma	f8bcfcc493	Easy start script: add did_user_forbid_replacing_xstartup()	4 years ago
Dmitry Maksyoma	22654f7ab6	Easy start script: handle incorrect DE number selection	4 years ago
Dmitry Maksyoma	33327c1159	Easy start script: can choose DE and run it via xstartup	4 years ago
Dmitry Maksyoma	aeec23bd68	test-deb: add temporary volume of .	4 years ago
Dmitry Maksyoma	34a389f714	Add temporary DE installations to Buster dockerfile	4 years ago
Dmitry Maksyoma	b8fd6a28a4	vncserver: add magic text to signify that the file can be replaced	4 years ago
Dmitry Maksyoma	240b1342fd	Easy start script: DE -> Desktop Environment	4 years ago
Dmitry Maksyoma	640a195e3e	Easy start script: choose DE to run spike	4 years ago