From f811c7504cf0d6ddc5fce422883b50f344209704 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Tue, 24 Mar 2026 09:21:40 +0000
Subject: [PATCH] Revert "VNC-151 Add CMake 3.22 installer in Dockerfile"

---
 .gitlab-ci.yml                                | 12 ++-
 builder/README.md                             | 35 ++++++++
 builder/build.sh                              |  2 +
 builder/dockerfile.alpine_318.build           | 89 -------------------
 builder/dockerfile.alpine_319.apk.build       | 19 ----
 builder/dockerfile.alpine_320.apk.build       | 19 ----
 .../dockerfile.alpine_320.barebones.apk.test  |  1 -
 ....build => dockerfile.alpine_322.apk.build} |  4 +-
 ... dockerfile.alpine_322.barebones.apk.test} |  0
 ..._319.build => dockerfile.alpine_322.build} |  9 +-
 ....build => dockerfile.alpine_323.apk.build} |  4 +-
 ... dockerfile.alpine_323.barebones.apk.test} |  0
 ..._320.build => dockerfile.alpine_323.build} | 13 +--
 builder/dockerfile.kali_kali-rolling.build    | 19 +++-
 14 files changed, 73 insertions(+), 153 deletions(-)
 delete mode 100644 builder/dockerfile.alpine_318.build
 delete mode 100644 builder/dockerfile.alpine_319.apk.build
 delete mode 100644 builder/dockerfile.alpine_320.apk.build
 delete mode 120000 builder/dockerfile.alpine_320.barebones.apk.test
 rename builder/{dockerfile.alpine_317.apk.build => dockerfile.alpine_322.apk.build} (86%)
 rename builder/{dockerfile.alpine_318.barebones.apk.test => dockerfile.alpine_322.barebones.apk.test} (100%)
 rename builder/{dockerfile.alpine_319.build => dockerfile.alpine_322.build} (93%)
 rename builder/{dockerfile.alpine_318.apk.build => dockerfile.alpine_323.apk.build} (86%)
 rename builder/{dockerfile.alpine_319.barebones.apk.test => dockerfile.alpine_323.barebones.apk.test} (100%)
 rename builder/{dockerfile.alpine_320.build => dockerfile.alpine_323.build} (90%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 261ee32..8bfbe49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,14 +80,12 @@ stages:
         GROUP: 11
       - DISTRO: 'fedora 43'
         GROUP: 12
-      - DISTRO: 'alpine 318'
-        GROUP: 13
-      - DISTRO: 'alpine 319'
-        GROUP: 14
-      - DISTRO: 'alpine 320'
-        GROUP: 15
       - DISTRO: 'alpine 321'
-        GROUP: 16
+        GROUP: 13
+      - DISTRO: 'alpine 322'
+        GROUP: 14
+      - DISTRO: 'alpine 323'
+        GROUP: 15
 
 default:
   retry: 2
diff --git a/builder/README.md b/builder/README.md
index 0daf66f..5a1c944 100644
--- a/builder/README.md
+++ b/builder/README.md
@@ -23,6 +23,41 @@ builder/build-package kali kali-rolling
 builder/build-package fedora thirtythree
 ```
 
+# Build an apk package
+
+## Requirements
+Building an apk package requires a signing key to be present in environment.
+
+For example:
+```sh
+KASMVNC_ALPINE_PRIVATE_KEY=$(cat <<EOF
+-----BEGIN PRIVATE KEY-----
+...
+-----END PRIVATE KEY-----
+EOF
+)
+
+KASMVNC_ALPINE_PUBLIC_KEY=$(cat <<EOF
+-----BEGIN PUBLIC KEY-----
+...
+-----END PUBLIC KEY-----
+EOF
+)
+
+export KASMVNC_ALPINE_PRIVATE_KEY
+export KASMVNC_ALPINE_PUBLIC_KEY
+```
+
+You can create a signing key by using:
+```sh
+apk add abuild
+abuild-keygen -a
+```
+## Building
+```sh
+builder/build-package alpine 321
+```
+
 # Build and test a package
 ```
 builder/build-and-test-deb ubuntu focal
diff --git a/builder/build.sh b/builder/build.sh
index 80b40b7..43e78f9 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -154,6 +154,8 @@ elif [ -d /usr/lib/arm-linux-gnueabihf/dri ]; then
   ln -sfn /usr/lib/arm-linux-gnueabihf/dri dri
 elif [ -d /usr/lib/xorg/modules/dri ]; then
   ln -sfn /usr/lib/xorg/modules/dri dri
+elif [ -d /usr/lib/dri ]; then
+  ln -sfn /usr/lib/dri dri
 else
   ln -sfn /usr/lib64/dri dri
 fi
diff --git a/builder/dockerfile.alpine_318.build b/builder/dockerfile.alpine_318.build
deleted file mode 100644
index 60724dc..0000000
--- a/builder/dockerfile.alpine_318.build
+++ /dev/null
@@ -1,89 +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 --no-cache \
-    alpine-release \
-    alpine-sdk \
-    autoconf \
-    automake \
-    bash \
-    ca-certificates \
-    cmake \
-    nasm \
-    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 \
-    libva-dev \
-    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-va-gallium \
-    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 \
-    ffmpeg-dev \
-    libdrm-dev
-
-RUN if [ "$(uname -m)" = "x86_64" ]; then \
-        apk add --no-cache intel-media-driver; \
-    fi
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-deps.sh
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-
-COPY --chown=docker:docker . /src/
-
-USER docker
-ENTRYPOINT ["/src/builder/build.sh"]
diff --git a/builder/dockerfile.alpine_319.apk.build b/builder/dockerfile.alpine_319.apk.build
deleted file mode 100644
index 95b6bc6..0000000
--- a/builder/dockerfile.alpine_319.apk.build
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM alpine:3.19
-
-RUN apk add shadow bash
-RUN apk add abuild sudo less
-
-ENV HOME /src/alpine
-WORKDIR $HOME/kasmvncserver
-
-ARG KASMVNC_ALPINE_PRIVATE_KEY
-ARG KASMVNC_ALPINE_PUBLIC_KEY
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/install_alpine_signing_keys
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-RUN echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
-
-USER docker
diff --git a/builder/dockerfile.alpine_320.apk.build b/builder/dockerfile.alpine_320.apk.build
deleted file mode 100644
index 8791c8b..0000000
--- a/builder/dockerfile.alpine_320.apk.build
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM alpine:3.20
-
-RUN apk add shadow bash
-RUN apk add abuild sudo less
-
-ENV HOME /src/alpine
-WORKDIR $HOME/kasmvncserver
-
-ARG KASMVNC_ALPINE_PRIVATE_KEY
-ARG KASMVNC_ALPINE_PUBLIC_KEY
-
-ENV SCRIPTS_DIR=/tmp/scripts
-COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/install_alpine_signing_keys
-
-RUN useradd -m docker && echo "docker:docker" | chpasswd
-RUN echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
-
-USER docker
diff --git a/builder/dockerfile.alpine_320.barebones.apk.test b/builder/dockerfile.alpine_320.barebones.apk.test
deleted file mode 120000
index 388647d..0000000
--- a/builder/dockerfile.alpine_320.barebones.apk.test
+++ /dev/null
@@ -1 +0,0 @@
-dockerfile.alpine.barebones.apk.test
\ No newline at end of file
diff --git a/builder/dockerfile.alpine_317.apk.build b/builder/dockerfile.alpine_322.apk.build
similarity index 86%
rename from builder/dockerfile.alpine_317.apk.build
rename to builder/dockerfile.alpine_322.apk.build
index c0294c0..92bae6b 100644
--- a/builder/dockerfile.alpine_317.apk.build
+++ b/builder/dockerfile.alpine_322.apk.build
@@ -1,7 +1,7 @@
-FROM alpine:3.17
+FROM alpine:3.22
 
 RUN apk add shadow bash
-RUN apk add abuild sudo less
+RUN apk add abuild sudo less ffmpeg-dev
 
 ENV HOME /src/alpine
 WORKDIR $HOME/kasmvncserver
diff --git a/builder/dockerfile.alpine_318.barebones.apk.test b/builder/dockerfile.alpine_322.barebones.apk.test
similarity index 100%
rename from builder/dockerfile.alpine_318.barebones.apk.test
rename to builder/dockerfile.alpine_322.barebones.apk.test
diff --git a/builder/dockerfile.alpine_319.build b/builder/dockerfile.alpine_322.build
similarity index 93%
rename from builder/dockerfile.alpine_319.build
rename to builder/dockerfile.alpine_322.build
index 6bd1af2..5409729 100644
--- a/builder/dockerfile.alpine_319.build
+++ b/builder/dockerfile.alpine_322.build
@@ -1,8 +1,8 @@
-FROM alpine:3.19
+FROM alpine:3.22
 
 ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 319
-ENV XORG_VER 21.1.12
+ENV KASMVNC_BUILD_OS_CODENAME 322
+ENV XORG_VER 21.1.19
 
 RUN \
   echo "**** install build deps ****" && \
@@ -43,7 +43,6 @@ RUN \
     libxrandr-dev \
     libxshmfence-dev \
     libxtst-dev \
-    libva-dev \
     mesa-dev \
     mesa-dri-gallium \
     mesa-va-gallium \
@@ -71,7 +70,7 @@ RUN \
     xorg-server-dev \
     xtrans \
     ffmpeg-dev \
-    libdrm-dev
+    libva-dev
 
 RUN if [ "$(uname -m)" = "x86_64" ]; then \
         apk add --no-cache intel-media-driver; \
diff --git a/builder/dockerfile.alpine_318.apk.build b/builder/dockerfile.alpine_323.apk.build
similarity index 86%
rename from builder/dockerfile.alpine_318.apk.build
rename to builder/dockerfile.alpine_323.apk.build
index f55ac41..7633085 100644
--- a/builder/dockerfile.alpine_318.apk.build
+++ b/builder/dockerfile.alpine_323.apk.build
@@ -1,7 +1,7 @@
-FROM alpine:3.18
+FROM alpine:3.23
 
 RUN apk add shadow bash
-RUN apk add abuild sudo less
+RUN apk add abuild sudo less ffmpeg-dev
 
 ENV HOME /src/alpine
 WORKDIR $HOME/kasmvncserver
diff --git a/builder/dockerfile.alpine_319.barebones.apk.test b/builder/dockerfile.alpine_323.barebones.apk.test
similarity index 100%
rename from builder/dockerfile.alpine_319.barebones.apk.test
rename to builder/dockerfile.alpine_323.barebones.apk.test
diff --git a/builder/dockerfile.alpine_320.build b/builder/dockerfile.alpine_323.build
similarity index 90%
rename from builder/dockerfile.alpine_320.build
rename to builder/dockerfile.alpine_323.build
index e14b669..fa9c9bf 100644
--- a/builder/dockerfile.alpine_320.build
+++ b/builder/dockerfile.alpine_323.build
@@ -1,8 +1,8 @@
-FROM alpine:3.20
+FROM alpine:3.23
 
 ENV KASMVNC_BUILD_OS alpine
-ENV KASMVNC_BUILD_OS_CODENAME 320
-ENV XORG_VER 21.1.14
+ENV KASMVNC_BUILD_OS_CODENAME 323
+ENV XORG_VER 21.1.21
 
 RUN \
   echo "**** install build deps ****" && \
@@ -13,7 +13,6 @@ RUN \
     automake \
     bash \
     ca-certificates \
-    cmake \
     nasm \
     coreutils \
     curl \
@@ -43,7 +42,6 @@ RUN \
     libxrandr-dev \
     libxshmfence-dev \
     libxtst-dev \
-    libva-dev \
     mesa-dev \
     mesa-dri-gallium \
     mesa-va-gallium \
@@ -71,12 +69,15 @@ RUN \
     xorg-server-dev \
     xtrans \
     ffmpeg-dev \
-    libdrm-dev
+    libva-dev
 
 RUN if [ "$(uname -m)" = "x86_64" ]; then \
         apk add --no-cache intel-media-driver; \
     fi
 
+RUN apk add python3 py3-pip
+RUN pip install --break-system-packages cmake==3.22.6
+
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
 RUN $SCRIPTS_DIR/build-deps.sh
diff --git a/builder/dockerfile.kali_kali-rolling.build b/builder/dockerfile.kali_kali-rolling.build
index d55135a..c07e882 100644
--- a/builder/dockerfile.kali_kali-rolling.build
+++ b/builder/dockerfile.kali_kali-rolling.build
@@ -15,15 +15,28 @@ 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 ninja-build cmake nasm git libgnutls28-dev vim wget tightvncserver
+RUN apt-get update && apt-get -y install ninja-build nasm 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 libavformat-dev libswscale-dev libva-dev
+    libxcursor-dev libavformat-dev libswscale-dev libva-dev libcrypt-dev
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
+RUN ARCH=$(arch) && \
+  CMAKE_URL="https://cmake.org/files/v3.22/cmake-3.22.0" && \
+  if [ "$ARCH" = "x86_64" ]; then \
+      CMAKE_URL="${CMAKE_URL}-linux-x86_64.sh"; \
+  elif [ "$ARCH" = "aarch64" ]; then \
+      CMAKE_URL="${CMAKE_URL}-linux-aarch64.sh"; \
+  else \
+      echo "Unsupported architecture: $ARCH" && exit 1; \
+  fi && \
+  curl -fsSL $CMAKE_URL -o cmake.sh && \
+  (echo y; echo n) | bash cmake.sh --prefix=/usr/local --skip-license && \
+  rm cmake.sh
+
 RUN $SCRIPTS_DIR/build-deps.sh
 
-RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+RUN useradd -m docker && echo "docker:docker" | chpasswd && usermod -aG sudo docker
 
 COPY --chown=docker:docker . /src/