UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Verified Commit 08a18675 authored by Dmytro Makovey's avatar Dmytro Makovey
Browse files

Update GitLab to the 17.6.0 Minor Feature Release

parent 36e2f012
No related branches found
No related tags found
2 merge requests!36Update gitlab to master,!35Update GitLab to the 17.6.0 Minor Feature Release
Pipeline #3757704 passed with warnings
ARG GITLAB_VERSION=v17.5.2-ubi
ARG GITLAB_VERSION=v17.6.0-ubi
ARG BASE_REGISTRY=registry1.dso.mil/ironbank
ARG BASE_IMAGE=gitlab/gitlab/gitlab-base
ARG BASE_TAG=17.5.2
ARG BASE_TAG=17.6.0
ARG UBI_TAG=9.4
## FINAL IMAGE ##
......
......@@ -6,7 +6,7 @@ set -euxo pipefail
REGISTRY=${1:-}
REPOSITORY=${2:-"$(basename "$(builtin cd "$(dirname "$0")/.."; pwd)")"}
TAG=${3:-17.5.2}
TAG=${3:-17.6.0}
DOCKER_BUILD="${DOCKER_BUILD:-docker build}"
DOCKER_OPTS=${DOCKER_OPTS:-""}
......
#!/bin/sh
set -e
if [ "$FIPS_MODE" -eq 1 ]; then
(>&2 echo "Configuration: Setting gcrypt/libcrypt component to enforce FIPS")
## Enforce gcrypt/libcrypt (GnuPG)
# https://www.gnupg.org/documentation/manuals/gcrypt/Enabling-FIPS-mode.html
mkdir -p /etc/gcrypt
printf 1 > /etc/gcrypt/fips_enabled
fi
\ No newline at end of file
......@@ -5,12 +5,12 @@ name: "gitlab/gitlab/certificates"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "17.5.2"
- "17.6.0"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-base"
BASE_TAG: "17.5.2"
BASE_TAG: "17.6.0"
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.5.2"
org.opencontainers.image.version: "17.6.0"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
## This value can be "opensource" or "commercial"
......
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