Skip to content
Snippets Groups Projects
Commit af9c39f0 authored by Wenbin Shu's avatar Wenbin Shu
Browse files

Merge branch '16-5-stable-jh-patch-3' into '16-5-stable-jh'

Prepare 16.5.3 release for cng-jh

See merge request gitlab-cn/build/cng-images!104
parents 2666ceb0 c29ea1c2
Branches
Tags v16.5.3-jh
No related merge requests found
Pipeline #255762 passed with stages
in 44 minutes and 16 seconds
......@@ -453,7 +453,7 @@
- pg_image="${CI_REGISTRY_IMAGE}/postgresql:${pg_version}"
- gei_dir_version=$(get_version gitlab-elasticsearch-indexer)
- gei_version=($(echo -n "$GITLAB_ELASTICSEARCH_INDEXER_VERSION$go_version$gei_dir_version" | sha1sum))
- gei_image="${CI_REGISTRY_IMAGE}/gitlab-elasticsearch-indexer:${gei_version}${IMAGE_TAG_EXT}"
- gei_image="${CI_REGISTRY_IMAGE}/gitlab-elasticsearch-indexer:${gei_version}"
- gm_version=$(cat artifacts/container_versions/gitlab-graphicsmagick_tag.txt)
- gm_image="${CI_REGISTRY_IMAGE}/gitlab-graphicsmagick:${gm_version}"
- exiftool_version=$(cat artifacts/container_versions/gitlab-exiftool_tag.txt)
......@@ -469,13 +469,13 @@
--build-arg "CACHE_BUSTER=$GITLAB_VERSION$(date -uI)"
--build-arg "TAG=$ruby_version${IMAGE_TAG_EXT}"
--build-arg "PG_IMAGE=$pg_image"
--build-arg "GEI_IMAGE=${gei_image}"
--build-arg "GEI_IMAGE=${gei_image}${IMAGE_TAG_EXT}"
--build-arg "ASSETS_IMAGE=${ASSETS_IMAGE}"
--build-arg "RUBY_IMAGE=${CI_REGISTRY_IMAGE}/gitlab-ruby:$ruby_version${IMAGE_TAG_EXT}"
--build-arg "RUST_TAG=${rust_version}${IMAGE_TAG_EXT}"
--build-arg "GM_IMAGE=${gm_image}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}"
--build-arg "RUBY_VERSION=${RUBY_VERSION}"
--build-arg "GM_IMAGE=${gm_image}${IMAGE_TAG_EXT}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}${IMAGE_TAG_EXT}"
--build-arg "RUBY_VERSION=${RUBY_VERSION}${IMAGE_TAG_EXT}"
- push_tags
- push_tags $GITLAB_REF_SLUG${IMAGE_TAG_EXT}
- if [ ! "$UBI_PIPELINE" = "true" ]; then
......@@ -523,10 +523,10 @@
--build-arg "TAG=$ruby_version"
--build-arg "PG_IMAGE=$pg_image"
--build-arg "ASSETS_IMAGE=${ASSETS_IMAGE}"
--build-arg "RUST_TAG=${rust_version}"
--build-arg "GM_IMAGE=${gm_image}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}"
--build-arg "RUBY_VERSION=${RUBY_VERSION}"
--build-arg "RUST_TAG=${rust_version}${IMAGE_TAG_EXT}"
--build-arg "GM_IMAGE=${gm_image}${IMAGE_TAG_EXT}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}${IMAGE_TAG_EXT}"
--build-arg "RUBY_VERSION=${RUBY_VERSION}${IMAGE_TAG_EXT}"
- push_tags
- push_tags $GITLAB_REF_SLUG
- if [ ! "$UBI_PIPELINE" = "true" ]; then
......@@ -583,7 +583,7 @@
- export CONTAINER_VERSION=($(echo -n "$rails_container$TARGET_VERSION" | sha1sum))
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ee:$rails_container${IMAGE_TAG_EXT}"
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ee"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "GITLAB_VERSION=${GITLAB_VERSION}"
--build-arg "RAILS_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ee:$rails_container${IMAGE_TAG_EXT}"
......@@ -611,7 +611,7 @@
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ee:$rails_container${IMAGE_TAG_EXT}"
- fi
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ee"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_VERSION=${GITLAB_VERSION}"
......@@ -634,11 +634,11 @@
- python_version=$(cat artifacts/container_versions/gitlab-python_tag.txt)
- export FORCE_IMAGE_BUILDS="${FORCE_IMAGE_BUILDS-${FORCE_RAILS_IMAGE_BUILDS-false}}"
- export CONTAINER_VERSION=($(echo -n "$rails_container$TARGET_VERSION" | sha1sum))
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ce:$rails_container"
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ce:$rails_container${IMAGE_TAG_EXT}"
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ce"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ce:$bootsnap_container"
--build-arg "PYTHON_TAG=${python_version}"
--build-arg "TAG=$rails_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ce:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "GITLAB_LOGGER_IMAGE=${CI_REGISTRY_IMAGE}/gitlab-logger:${GITLAB_LOGGER_VERSION}${IMAGE_TAG_EXT}"
- push_tags
- push_tags $GITLAB_REF_SLUG
......@@ -662,7 +662,7 @@
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ee:$rails_container${IMAGE_TAG_EXT}"
- fi
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ee"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "S3CMD_VERSION=$S3CMD_VERSION"
......@@ -687,11 +687,11 @@
- python_version=$(cat artifacts/container_versions/gitlab-python_tag.txt)
- export FORCE_IMAGE_BUILDS="${FORCE_IMAGE_BUILDS-${FORCE_RAILS_IMAGE_BUILDS-false}}"
- export CONTAINER_VERSION=($(echo -n "$rails_container$TARGET_VERSION" | sha1sum))
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ce:$rails_container"
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ce:$rails_container${IMAGE_TAG_EXT}"
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ce"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ce:$bootsnap_container"
--build-arg "TAG=$rails_container"
--build-arg "PYTHON_TAG=${python_version}"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ce:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "S3CMD_VERSION=$S3CMD_VERSION"
--build-arg "GITALY_IMAGE=$CI_REGISTRY_IMAGE/gitaly:$gitaly_container${IMAGE_TAG_EXT}"
- push_tags
......@@ -719,7 +719,7 @@
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ee:$rails_container${IMAGE_TAG_EXT}"
- fi
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ee"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ee:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_VERSION=${GITLAB_VERSION}"
......@@ -742,11 +742,11 @@
- python_version=$(cat artifacts/container_versions/gitlab-python_tag.txt)
- export FORCE_IMAGE_BUILDS="${FORCE_IMAGE_BUILDS-${FORCE_RAILS_IMAGE_BUILDS-false}}"
- export CONTAINER_VERSION=($(echo -n "$rails_container$TARGET_VERSION" | sha1sum))
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ce:$rails_container"
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ce:$rails_container${IMAGE_TAG_EXT}"
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-ce"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ce:$bootsnap_container"
--build-arg "TAG=$rails_container"
--build-arg "PYTHON_TAG=${python_version}"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-ce:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
- push_tags
- push_tags $GITLAB_REF_SLUG
......@@ -769,9 +769,9 @@
- build_if_needed --build-arg "GO_TAG=${go_version}${IMAGE_TAG_EXT}"
--build-arg "TAG=${gitlab_base_version}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_VERSION=$GITLAB_VERSION"
--build-arg "RAILS_VERSION=${rails_container}"
--build-arg "RAILS_VERSION=${rails_container}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_EDITION=gitlab-rails-ce"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_BASE_IMAGE=${GITLAB_BASE_IMAGE}"
- push_tags
- push_tags $GITLAB_REF_SLUG
......@@ -800,7 +800,7 @@
--build-arg "GITLAB_VERSION=$GITLAB_VERSION"
--build-arg "RAILS_VERSION=$rails_container${IMAGE_TAG_EXT}"
--build-arg "GITLAB_EDITION=gitlab-rails-ee"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_BASE_IMAGE=${GITLAB_BASE_IMAGE}"
- push_tags
- push_tags $GITLAB_REF_SLUG${IMAGE_TAG_EXT}
......@@ -62,7 +62,7 @@ gitlab-rails-jh:
- pg_image="${CI_REGISTRY_IMAGE}/postgresql:${pg_version}"
- gei_dir_version=$(get_version gitlab-elasticsearch-indexer)
- gei_version=($(echo -n "$GITLAB_ELASTICSEARCH_INDEXER_VERSION$go_version$gei_dir_version" | sha1sum))
- gei_image="${CI_REGISTRY_IMAGE}/gitlab-elasticsearch-indexer:${gei_version}${IMAGE_TAG_EXT}"
- gei_image="${CI_REGISTRY_IMAGE}/gitlab-elasticsearch-indexer:${gei_version}"
- gm_version=$(cat artifacts/container_versions/gitlab-graphicsmagick_tag.txt)
- gm_image="${CI_REGISTRY_IMAGE}/gitlab-graphicsmagick:${gm_version}"
- exiftool_version=$(cat artifacts/container_versions/gitlab-exiftool_tag.txt)
......@@ -78,13 +78,13 @@ gitlab-rails-jh:
--build-arg "CACHE_BUSTER=$GITLAB_VERSION$(date -uI)"
--build-arg "TAG=$ruby_version${IMAGE_TAG_EXT}"
--build-arg "PG_IMAGE=$pg_image"
--build-arg "GEI_IMAGE=${gei_image}"
--build-arg "GEI_IMAGE=${gei_image}${IMAGE_TAG_EXT}"
--build-arg "ASSETS_IMAGE=${ASSETS_IMAGE}"
--build-arg "RUBY_IMAGE=${CI_REGISTRY_IMAGE}/gitlab-ruby:$ruby_version${IMAGE_TAG_EXT}"
--build-arg "RUST_TAG=${rust_version}${IMAGE_TAG_EXT}"
--build-arg "GM_IMAGE=${gm_image}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}"
--build-arg "RUBY_VERSION=${RUBY_VERSION}"
--build-arg "GM_IMAGE=${gm_image}${IMAGE_TAG_EXT}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}${IMAGE_TAG_EXT}"
--build-arg "RUBY_VERSION=${RUBY_VERSION}${IMAGE_TAG_EXT}"
- push_tags
- push_tags $GITLAB_REF_SLUG${IMAGE_TAG_EXT}
- if [ ! "$UBI_PIPELINE" = "true" ]; then
......@@ -121,7 +121,7 @@ gitlab-toolbox-jh:
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-jh:$rails_container${IMAGE_TAG_EXT}"
- fi
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-jh"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "S3CMD_VERSION=$S3CMD_VERSION"
......@@ -150,7 +150,7 @@ gitlab-geo-logcursor:
- export CONTAINER_VERSION=($(echo -n "$rails_container$TARGET_VERSION" | sha1sum))
- export BASE_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-jh:$rails_container${IMAGE_TAG_EXT}"
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-jh"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "GITLAB_VERSION=${GITLAB_VERSION}"
--build-arg "RAILS_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-jh:$rails_container${IMAGE_TAG_EXT}"
......@@ -174,7 +174,7 @@ gitlab-webservice-jh:
- export FORCE_IMAGE_BUILDS="${FORCE_IMAGE_BUILDS-${FORCE_RAILS_IMAGE_BUILDS-false}}"
- export CONTAINER_VERSION=($(echo -n "$rails_container$TARGET_VERSION" | sha1sum))
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-jh"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_VERSION=${GITLAB_VERSION}"
......@@ -201,7 +201,7 @@ gitlab-sidekiq-jh:
- export FORCE_IMAGE_BUILDS="${FORCE_IMAGE_BUILDS-${FORCE_RAILS_IMAGE_BUILDS-false}}"
- export CONTAINER_VERSION=($(echo -n "$rails_container$TARGET_VERSION" | sha1sum))
- build_if_needed --build-arg "FROM_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-jh"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container"
--build-arg "BOOTSNAP_IMAGE=$CI_REGISTRY_IMAGE/gitlab-rails-bootsnap-jh:$bootsnap_container${IMAGE_TAG_EXT}"
--build-arg "TAG=$rails_container${IMAGE_TAG_EXT}"
--build-arg "PYTHON_TAG=${python_version}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_VERSION=${GITLAB_VERSION}"
......@@ -239,7 +239,7 @@ gitlab-workhorse-jh:
--build-arg "GITLAB_VERSION=$GITLAB_VERSION"
--build-arg "RAILS_VERSION=$rails_container${IMAGE_TAG_EXT}"
--build-arg "GITLAB_EDITION=gitlab-rails-jh"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}"
--build-arg "EXIFTOOL_IMAGE=${exiftool_image}${IMAGE_TAG_EXT}"
--build-arg "GOMPLATE_TAG=${gomplate_version}${IMAGE_TAG_EXT}"
--build-arg "GITLAB_BASE_IMAGE=${GITLAB_BASE_IMAGE}"
- push_tags
......
......@@ -4,14 +4,14 @@ variables:
UBI_IMAGE: registry.access.redhat.com/ubi8/ubi-minimal:8.8
ALPINE_IMAGE: alpine:3.15
GITLAB_ELASTICSEARCH_INDEXER_VERSION: v4.4.0
GITLAB_VERSION: v16.5.2-jh
GITLAB_REF_SLUG: v16.5.2-jh
GITLAB_ASSETS_TAG: v16-5-2-jh
GITLAB_VERSION: v16.5.3-jh
GITLAB_REF_SLUG: v16.5.3-jh
GITLAB_ASSETS_TAG: v16-5-3-jh
GITLAB_EXPORTER_VERSION: 13.4.1
GITLAB_SHELL_VERSION: v14.29.0
GITLAB_CONTAINER_REGISTRY_VERSION: v3.85.0-gitlab
GITALY_SERVER_VERSION: v16.5.2
GITLAB_PAGES_VERSION: v16.5.2
GITALY_SERVER_VERSION: v16.5.3
GITLAB_PAGES_VERSION: v16.5.3
GITLAB_KAS_VERSION: v16.5.0
MAILROOM_VERSION: 0.0.23
GITLAB_ZOEKT_WEBSERVER_VERSION: v0.0.2-fcb27
......
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