UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit be67f759 authored by CHT-ib11-17feb2025's avatar CHT-ib11-17feb2025
Browse files

Merge branch 'release-gitlab-17-6-2' into 'development'

Update GitLab to the 17.6.2 Patch Release

See merge request !39
parents 771ac3ac 15ed86b9
No related branches found
No related tags found
2 merge requests!40Update gitlab to master,!39Update GitLab to the 17.6.2 Patch Release
Pipeline #3799127 passed with warnings
ARG GITLAB_VERSION=v17.6.1-ubi
ARG GITLAB_VERSION=v17.6.2-ubi
ARG BASE_REGISTRY=registry1.dso.mil/ironbank
ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
ARG BASE_TAG=17.6.1
ARG BASE_TAG=17.6.2
ARG UBI_TAG=9.4
ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:${BASE_TAG}
......
......@@ -6,7 +6,7 @@ set -euxo pipefail
REGISTRY=${1:-}
REPOSITORY=${2:-"$(basename "$(builtin cd "$(dirname "$0")/.."; pwd)")"}
TAG=${3:-17.6.1}
TAG=${3:-17.6.2}
DOCKER_BUILD="${DOCKER_BUILD:-docker build}"
DOCKER_OPTS=${DOCKER_OPTS:-""}
......
......@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-mailroom"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "17.6.1"
- "17.6.2"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
BASE_TAG: "17.6.1"
BASE_TAG: "17.6.2"
UBI_TAG: "9.4"
# Docker image labels
labels:
......@@ -23,7 +23,7 @@ labels:
org.opencontainers.image.url: "https://about.gitlab.com/"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Gitlab"
org.opencontainers.image.version: "17.6.1"
org.opencontainers.image.version: "17.6.2"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
## This value can be "opensource" or "commercial"
......@@ -50,8 +50,8 @@ maintainers:
email: "help@dsop.io"
cht_member: true
resources:
- url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.6.1-ubi/gitlab-mailroom.tar.gz"
- url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.6.2-ubi/gitlab-mailroom.tar.gz"
filename: "gitlab-mailroom.tar.gz"
validation:
type: "sha256"
value: "a919a10e5c667f3367b40c3c5f40ed87798d90e48b22983bd40aa232a31e483c"
value: "ecc76226d4bb95d4356b1dfd1a723e302a08231b07330036d114a195b316e2b3"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment