diff --git a/Dockerfile b/Dockerfile index 68b12cdb831208eccf98978b5113f5f192e40cfe..9ab8e343fa4b2d725218f76a3fcb0de2efec3f9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -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 ## diff --git a/build-scripts/build.sh b/build-scripts/build.sh index ac9472872cbffc0f2ddc7a8e957dd2a0094f6ff0..02822c35dd5151a432941e18356ad7f5c57bcbae 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.7.0} +TAG=${3:-17.7.2} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index a64438f28e1b0281c1adc162f802469163ff9e32..8e0a8aa310603fbc3b14a7d2475e255ccece7fc4 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.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"