From dcb5ba032ba1c31a3df1a2536a164df6862e5206 Mon Sep 17 00:00:00 2001
From: Andrejs Cunskis <acunskis@gitlab.com>
Date: Wed, 12 Jun 2024 11:09:07 +0000
Subject: [PATCH] Remove bundler version from base image of qa dockerifle

---
 qa/Dockerfile          | 7 +++----
 scripts/build_qa_image | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/qa/Dockerfile b/qa/Dockerfile
index 975c6edd9e2d8..6600db178333a 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -1,12 +1,11 @@
 ARG DOCKER_VERSION=24.0.5
-ARG CHROME_VERSION=119
-ARG RUBY_VERSION=3.1
-ARG BUNDLER_VERSION=2.5
+ARG CHROME_VERSION=123
+ARG RUBY_VERSION=3.2.4
 ARG BUILD_OS=debian
 ARG OS_VERSION=bookworm
 ARG QA_BUILD_TARGET=ee
 
-FROM registry.gitlab.com/gitlab-org/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:bundler-${BUNDLER_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 AS foss
+FROM registry.gitlab.com/gitlab-org/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23 AS foss
 LABEL maintainer="GitLab Quality Department <quality@gitlab.com>"
 
 ENV DEBIAN_FRONTEND="noninteractive"
diff --git a/scripts/build_qa_image b/scripts/build_qa_image
index 7a783996124bb..cd465ec33e6af 100755
--- a/scripts/build_qa_image
+++ b/scripts/build_qa_image
@@ -87,7 +87,6 @@ docker buildx build \
   --build-arg=CHROME_VERSION="${CHROME_VERSION}" \
   --build-arg=DOCKER_VERSION="${DOCKER_VERSION}" \
   --build-arg=RUBY_VERSION="${RUBY_VERSION}" \
-  --build-arg=BUNDLER_VERSION="${BUNDLER_VERSION}" \
   --build-arg=BUILD_OS="${BUILD_OS}" \
   --build-arg=OS_VERSION="${OS_VERSION}" \
   --build-arg=QA_BUILD_TARGET="${QA_BUILD_TARGET}" \
-- 
GitLab