From 05e317d8c2c26ce83316a301dff406b4c7f6945a Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Wed, 15 Jan 2025 14:41:36 +0000
Subject: [PATCH] Update GitLab to the 17.7.2 Patch Release
---
Dockerfile | 4 ++--
build-scripts/build.sh | 2 +-
hardening_manifest.yaml | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ccf47d5..5a23b41 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-ARG GITLAB_VERSION=v17.7.0-ubi
+ARG GITLAB_VERSION=v17.7.2-ubi
ARG BASE_REGISTRY=registry1.dso.mil/ironbank
ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=17.7.0
+ARG BASE_TAG=17.7.2
ARG UBI_TAG=9.5
ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:${BASE_TAG}
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index ac94728..02822c3 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -6,7 +6,7 @@ set -euxo pipefail
REGISTRY=${1:-}
REPOSITORY=${2:-"$(basename "$(builtin cd "$(dirname "$0")/.."; pwd)")"}
-TAG=${3:-17.7.0}
+TAG=${3:-17.7.2}
DOCKER_BUILD="${DOCKER_BUILD:-docker build}"
DOCKER_OPTS=${DOCKER_OPTS:-""}
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 34c19a1..b669568 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -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.7.0"
+ - "17.7.2"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
- BASE_TAG: "17.7.0"
+ BASE_TAG: "17.7.2"
UBI_TAG: "9.5"
# 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.7.0"
+ org.opencontainers.image.version: "17.7.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.7.0-ubi/gitlab-mailroom.tar.gz"
+ - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.7.2-ubi/gitlab-mailroom.tar.gz"
filename: "gitlab-mailroom.tar.gz"
validation:
type: "sha256"
- value: "887662e8e3542b8305fdf36c1a719c029ea50be599f99a1d9ccfa669646904df"
+ value: "88a16f67d51250b27a55f5373a5ec19a3f9bd57669770cd5c862ef4bbe095d30"
--
GitLab