UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Verified Commit 06906d3f authored by Andrew Patterson's avatar Andrew Patterson
Browse files

Update GitLab to the 17.5.1 Minor Feature Release

parent 3e11a73b
No related branches found
No related tags found
2 merge requests!32Development,!31Update GitLab to the 17.5.1 Minor Feature Release
Pipeline #3712034 passed with warnings
ARG GITLAB_VERSION=v17.3.6-ubi
ARG BASE_REGISTRY=registry1.dso.mil
ARG GITLAB_VERSION=v17.5.1-ubi
ARG BASE_REGISTRY=registry1.dso.mil/ironbank
ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
ARG BASE_TAG=17.3.6
ARG BASE_TAG=17.5.1
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.3.6}
TAG=${3:-17.5.1}
DOCKER_BUILD="${DOCKER_BUILD:-docker build}"
DOCKER_OPTS=${DOCKER_OPTS:-""}
......
......@@ -3,7 +3,7 @@ set -e
(>&2 echo "Remediating: ' xccdf_org.ssgproject.content_rule_use_pam_wheel_for_su'")
if [ -e "/etc/pam.d/su"]; then
if [ -e "/etc/pam.d/su" ]; then
sed '/^[[:space:]]*#[[:space:]]*auth[[:space:]]\+required[[:space:]]\+pam_wheel\.so[[:space:]]\+use_uid$/s/^[[:space:]]*#//' \
-i /etc/pam.d/su
fi
......@@ -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.3.6"
- "17.5.1"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
BASE_TAG: "17.3.6"
BASE_TAG: "17.5.1"
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.3.6"
org.opencontainers.image.version: "17.5.1"
## 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.3.6-ubi/gitlab-mailroom.tar.gz"
- url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.5.1-ubi/gitlab-mailroom.tar.gz"
filename: "gitlab-mailroom.tar.gz"
validation:
type: "sha256"
value: "b769e201bfed3fefbd36e98693b33aff7c433749db2520e5eec5900ee985b2c5"
value: "58a7c71103c7d9eecbbe11a6c7163c86a5bf5d70c3013dd289bee9e54348733b"
......@@ -11,7 +11,7 @@ rm -rf /var/lib/apt/lists/*
gem install charlock_holmes:0.7.6 \
redis-client:0.22.2 \
redis:5.2.0 \
redis:5.3.0 \
redis-namespace:1.11.0 \
webrick:1.7.0 \
gitlab-mail_room:${MAILROOM_VERSION}
......
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