From 5be31149a3cbe95ff96df7d926d49c0bead71072 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 14 Nov 2025 17:14:07 +0000
Subject: [PATCH] VNC-277 CI: update to a newer docker

---
 .ci/helpers.sh           |  2 +-
 .gitlab-ci.yml           | 19 ++++++++++---------
 kasmvnc-functional-tests |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.ci/helpers.sh b/.ci/helpers.sh
index 442a8aa..b50cbc3 100644
--- a/.ci/helpers.sh
+++ b/.ci/helpers.sh
@@ -146,7 +146,7 @@ function upload_to_s3() {
 function prepare_to_run_scripts_and_s3_uploads() {
   export DEBIAN_FRONTEND=noninteractive
   apt-get update
-  apt-get install -y ruby3.1 wget curl file awscli
+  apt-get install -y ruby wget curl file awscli git
 }
 
 detect_release_branch() {
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b653e0e..20193bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ variables:
   # To debug upload stage, you can limit BUILD_DISTROS_REGEX to jammy and allow
   # run_test distros to fail, by setting ALLOW_RUN_TESTS_TO_FAIL to true.
   ALLOW_RUN_TESTS_TO_FAIL: false
+  DEBIAN_STABLE_IMAGE: debian:trixie-slim
   DOCKER_HOST: tcp://docker:2375
   DOCKER_TLS_CERTDIR: ""
 
@@ -38,7 +39,7 @@ stages:
   - pwd
   - mkdir -p "$GITLAB_SHARED_DIND_DIR" && chmod 777 "$GITLAB_SHARED_DIND_DIR"
   - apt-get update && apt-get install -y docker.io
-  - docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
+  - echo "$DOCKER_HUB_PASSWORD" | docker login --username $DOCKER_HUB_USERNAME --password-stdin
 
 .prepare_www: &prepare_www
   - tar -zxf output/www/kasm_www.tar.gz -C builder/
@@ -57,7 +58,7 @@ default:
 
 functional_test:
   stage: functional_test
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - oci-fixed-amd
   before_script:
@@ -105,7 +106,7 @@ build_www:
 build_amd64:
   stage: build
   allow_failure: true
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - oci-fixed-amd
   before_script:
@@ -127,7 +128,7 @@ build_amd64:
 build_arm64:
   stage: build
   allow_failure: true
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - oci-fixed-arm
   before_script:
@@ -148,7 +149,7 @@ build_arm64:
 
 run_test_amd64:
   stage: run_test
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - oci-fixed-amd
   before_script:
@@ -177,7 +178,7 @@ run_test_amd64:
 
 run_test_arm64:
   stage: run_test
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - oci-fixed-arm
   before_script:
@@ -207,7 +208,7 @@ run_test_arm64:
 
 spec_test:
   stage: test
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - kasmvnc-x86
   before_script:
@@ -223,7 +224,7 @@ spec_test:
 
 upload:
   stage: upload
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - oci-fixed-amd
   artifacts:
@@ -262,7 +263,7 @@ upload_build_preview:
   stage: upload
   needs: ["upload"]
   dependencies: ["upload"]
-  image: debian:bookworm-slim
+  image: $DEBIAN_STABLE_IMAGE
   tags:
     - oci-fixed-amd
   before_script:
diff --git a/kasmvnc-functional-tests b/kasmvnc-functional-tests
index 8af65a3..fa9906e 160000
--- a/kasmvnc-functional-tests
+++ b/kasmvnc-functional-tests
@@ -1 +1 @@
-Subproject commit 8af65a338e92c055fbdc958404a87d719cf05d8a
+Subproject commit fa9906edb45bd055dba887132323026078187069