UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Unverified Commit b171eb4c authored by Andrew Patterson's avatar Andrew Patterson
Browse files

Update GitLab to the 17.10.0 Minor Feature Release

parent 7fba909d
No related branches found
No related tags found
2 merge requests!59Update gitlab to master,!58Update GitLab to the 17.10.0 Minor Feature Release
Pipeline #4039484 passed with warnings
ARG GITLAB_VERSION=v17.9.2-ubi
ARG GITLAB_VERSION=v17.10.0-ubi
ARG BASE_REGISTRY=registry1.dso.mil/ironbank
ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
ARG BASE_TAG=17.9.2
ARG BASE_TAG=17.10.0
ARG UBI_TAG=9.5
ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:${BASE_TAG}
......@@ -35,7 +35,7 @@ RUN microdnf ${DNF_OPTS} ${DNF_OPTS_ROOT} install --best --assumeyes --nodocs --
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ARG MAILROOM_VERSION=0.0.25
ARG MAILROOM_VERSION=0.0.27
ARG GITLAB_USER=git
ARG UID=1000
ARG FIPS_MODE=0
......
......@@ -6,7 +6,7 @@ set -euxo pipefail
REGISTRY=${1:-}
REPOSITORY=${2:-"$(basename "$(builtin cd "$(dirname "$0")/.."; pwd)")"}
TAG=${3:-17.9.2}
TAG=${3:-17.10.0}
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.9.2"
- "17.10.0"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
BASE_TAG: "17.9.2"
BASE_TAG: "17.10.0"
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.9.2"
org.opencontainers.image.version: "17.10.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"
......@@ -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.9.2-ubi/gitlab-mailroom.tar.gz"
- url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.10.0-ubi/gitlab-mailroom.tar.gz"
filename: "gitlab-mailroom.tar.gz"
validation:
type: "sha256"
value: "29bfbcc8dfbfc292ffcd684f3992291ec40bdf57365cb9554e949c1c600dd869"
value: "3e52824c864404f09425bee300298398dff76ae891480f565fdd8ae49ac135db"
......@@ -11,7 +11,7 @@ rm -rf /var/lib/apt/lists/*
gem install charlock_holmes:0.7.6 \
redis-client:0.23.2 \
redis:5.3.0 \
redis:5.4.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