From 43aff1cd7e4456983e9382161661814208599760 Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Wed, 11 Dec 2024 19:38:47 +0000
Subject: [PATCH] Update GitLab to the 17.6.2 Security 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 f0b35e3..17db7e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-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-base
-ARG BASE_TAG=17.6.1
+ARG BASE_TAG=17.6.2
ARG UBI_TAG=9.4
## FINAL IMAGE ##
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index e8d23f7..f87d229 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.6.1}
+TAG=${3:-17.6.2}
DOCKER_BUILD="${DOCKER_BUILD:-docker build}"
DOCKER_OPTS=${DOCKER_OPTS:-""}
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 7811c85..50dca7e 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-pages"
# 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-base"
- 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-pages.tar.gz"
+ - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.6.2-ubi/gitlab-pages.tar.gz"
filename: "gitlab-pages.tar.gz"
validation:
type: "sha256"
- value: "c0fec16ea432841c70d67c1f89b79a22f10d121f82ac0d585be7d5e4a4bce0bb"
+ value: "74394b5dcf0d6e1a3611bb3cdf01ff24dbd5a0ae15450b301d4c73b7b5121a33"
--
GitLab