Skip to content
Snippets Groups Projects
Commit 71bd9d79 authored by JH_CNG_SYNC_TOKEN's avatar JH_CNG_SYNC_TOKEN
Browse files

Merge remote-tracking branch 'origin/master' into main-jh

parents d218b556 b76d22cc
Branches
Tags
No related merge requests found
Pipeline #274553 passed with stages
in 1 hour, 40 minutes, and 29 seconds
......@@ -28,7 +28,7 @@ variables:
# Suffix to the cache key of gitlab-rails-* where Gem vendor bundles are stored. Enables easy cache busting.
RAILS_CACHE_SUFFIX: "20230622" # quoted string, so `gitlab-runner exec ...` functions
DNF_OPTS: '--disableplugin=subscription-manager'
DOCKER_VERSION: 23.0.6
DOCKER_VERSION: 25.0.3
# Version for all instances of `gitlab-omnibus-builder/distribution_ci_tools`
CI_TOOLS_VERSION: "4.33.0"
COSIGN_YES: "true"
......
......@@ -11,7 +11,7 @@ variables:
GITLAB_ASSETS_TAG: "main-jh"
GITLAB_EXPORTER_VERSION: "14.3.0"
GITLAB_SHELL_VERSION: "main"
GITLAB_CONTAINER_REGISTRY_VERSION: "v3.88.1-gitlab"
GITLAB_CONTAINER_REGISTRY_VERSION: "v3.89.0-gitlab"
GITALY_SERVER_VERSION: "master"
GITLAB_PAGES_VERSION: "master"
GITLAB_KAS_VERSION: "master"
......
......@@ -7,7 +7,7 @@ ARG GITLAB_BASE_IMAGE="${CI_REGISTRY_IMAGE}/gitlab-base:${TAG}"
FROM --platform=${TARGETPLATFORM} ${FROM_IMAGE}:${GO_TAG} as builder
ARG DOCKER_BUILDTAGS="include_oss include_gcs continuous_profiler_stackdriver"
ARG REGISTRY_VERSION=v3.88.1-gitlab
ARG REGISTRY_VERSION=v3.89.0-gitlab
ARG REGISTRY_NAMESPACE=gitlab-org
ARG REGISTRY_PROJECT=container-registry
ARG GOPATH=/go
......
......@@ -3,7 +3,7 @@ ARG BUILD_IMAGE=
FROM ${BUILD_IMAGE}
ARG DOCKER_BUILDTAGS="include_oss include_gcs continuous_profiler_stackdriver"
ARG REGISTRY_VERSION=v3.88.1-gitlab
ARG REGISTRY_VERSION=v3.89.0-gitlab
ARG REGISTRY_NAMESPACE=gitlab-org
ARG REGISTRY_PROJECT=container-registry
ARG GOPATH=/go
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment