UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 1bf5552c authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

Update gitlab to master

See merge request !44
parents 2bb17c42 fa916823
No related branches found
No related tags found
1 merge request!44Update gitlab to master
Pipeline #3877186 passed with warnings
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-base
ARG BASE_TAG=17.7.0
ARG BASE_TAG=17.7.2
ARG UBI_TAG=9.5
## FINAL IMAGE ##
......
......@@ -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:-""}
......
......@@ -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.7.0"
- "17.7.2"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-base"
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"
......
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