Merge branch '17-9-stable-jh-patch-2' into '17-9-stable-jh'

Prepare 17.9.2 release for cng-jh

See merge request !257

ci_files/variables.yml

@@ -5,15 +5,15 @@ variables:
   UBI_MICRO_IMAGE: registry.access.redhat.com/ubi9/ubi-micro:9.5
   ALPINE_IMAGE: alpine:3.15
   GITLAB_ELASTICSEARCH_INDEXER_VERSION: v5.4.0
-  GITLAB_VERSION: v17.9.1-jh
-  GITLAB_REF_SLUG: v17.9.1-jh
-  GITLAB_ASSETS_TAG: v17-9-1-jh
+  GITLAB_VERSION: v17.9.2-jh
+  GITLAB_REF_SLUG: v17.9.2-jh
+  GITLAB_ASSETS_TAG: v17-9-2-jh
   GITLAB_EXPORTER_VERSION: 15.2.0
   GITLAB_SHELL_VERSION: v14.40.0
   GITLAB_CONTAINER_REGISTRY_VERSION: v4.15.2-gitlab
-  GITALY_SERVER_VERSION: v17.9.1
-  GITLAB_PAGES_VERSION: v17.9.1
-  GITLAB_KAS_VERSION: v17.9.1
+  GITALY_SERVER_VERSION: v17.9.2
+  GITLAB_PAGES_VERSION: v17.9.2
+  GITLAB_KAS_VERSION: v17.9.2
   MAILROOM_VERSION: 0.0.25
   GITLAB_ZOEKT_WEBSERVER_VERSION: v0.1.0-b8ea9
   GITLAB_ZOEKT_DYNAMIC_INDEXSERVER_VERSION: v0.1.0-b8ea9
@@ -35,7 +35,7 @@ variables:
   PYOPENSSL_VERSION: 24.2.1
   KUBECTL_VERSION: 1.32.1
   YQ_VERSION: 4.45.1
-  PG_VERSION: '16.6'
+  PG_VERSION: '16.8'
   CA_PKG_VERSION: 20220614-r0
   CFSSL_VERSION: 1.6.1
   CFSSL_CHECKSUM_SHA256: 89e600cd5203a025f8b47c6cd5abb9a74b06e3c7f7f7dd3f5b2a00975b15a491

gitlab-mailroom/Dockerfile

@@ -5,7 +5,7 @@ ARG FROM_IMAGE=registry.gitlab.com/gitlab-org/build/cng/gitlab-ruby
 
 FROM --platform=${TARGETPLATFORM} ${FROM_IMAGE}:${TAG}
 
-ARG MAILROOM_VERSION=0.0.25
+ARG MAILROOM_VERSION=0.0.27
 ARG GITLAB_USER=git
 
 RUN adduser --disabled-password --gecos 'GitLab' ${GITLAB_USER} && \

gitlab-mailroom/Dockerfile.build.ubi

@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=
 
 FROM ${BUILD_IMAGE}
 
-ARG MAILROOM_VERSION=0.0.25
+ARG MAILROOM_VERSION=0.0.27
 ENV LIBDIR ${LIBDIR:-"/usr/lib64"}
 
 ADD gitlab-ruby.tar.gz /

gitlab-rails/Dockerfile.erb

 ARG CI_REGISTRY_IMAGE="registry.gitlab.com/gitlab-org/build/cng"
 ARG TAG="master"
 ARG FROM_IMAGE="$CI_REGISTRY_IMAGE/gitlab-ruby"
-ARG PG_VERSION="16.6"
+ARG PG_VERSION="16.8"
 ARG PG_IMAGE="$CI_REGISTRY_IMAGE/postgresql:${PG_VERSION}"
 ARG GM_IMAGE="$CI_REGISTRY_IMAGE/gitlab-graphicsmagick:${GM_VERSION}"
 ARG EXIFTOOL_IMAGE="$CI_REGISTRY_IMAGE/gitlab-exiftool:${EXIFTOOL_VERSION}"

postgresql/Dockerfile

@@ -2,7 +2,7 @@ ARG DEBIAN_IMAGE=debian:bookworm-slim
 FROM --platform=${TARGETPLATFORM} ${DEBIAN_IMAGE} AS build
 
 ARG BUILD_DIR=/tmp/build
-ARG PG_VERSION=16.6
+ARG PG_VERSION=16.8
 
 ENV LANG=C.UTF-8
 

postgresql/Dockerfile.build.ubi

@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=
 
 FROM ${BUILD_IMAGE}
 
-ARG PG_VERSION=16.6
+ARG PG_VERSION=16.8
 
 ENV LANG=C.UTF-8