diff --git a/Dockerfile b/Dockerfile index cff2510d073feb56b45d3e8225e01f7a60245f34..a011aa9f7f667a36e26a4e54c17a651fa1b28b9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG GITLAB_VERSION=v17.9.1-ubi +ARG GITLAB_VERSION=v17.9.2-ubi ARG BASE_REGISTRY=registry1.dso.mil/ironbank ARG BASE_IMAGE=gitlab/gitlab/gitlab-base -ARG BASE_TAG=17.9.1 +ARG BASE_TAG=17.9.2 ARG UBI_TAG=9.5 ## FINAL IMAGE ## diff --git a/build-scripts/build.sh b/build-scripts/build.sh index f8dc8d14a1f8b7833d285f0f90590a3fe305b0c9..ada61963d8d285618cccddf6b2736420c7761ccc 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.9.1} +TAG=${3:-17.9.2} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 528df8e1561f9cf1d354f61e9a8fd2b43a048657..7bfe6b9810cbd95ac5839181c50ff0c180875012 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -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.9.1" + - "17.9.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-base" - BASE_TAG: "17.9.1" + BASE_TAG: "17.9.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.9.1" + org.opencontainers.image.version: "17.9.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"