diff --git a/Dockerfile b/Dockerfile index 9ab8e343fa4b2d725218f76a3fcb0de2efec3f9f..1c14c987f0551d2267227a012e9f49e9a93fe8f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG GITLAB_VERSION=v17.7.2-ubi +ARG GITLAB_VERSION=v17.8.0-ubi ARG BASE_REGISTRY=registry1.dso.mil/ironbank ARG BASE_IMAGE=gitlab/gitlab/gitlab-base -ARG BASE_TAG=17.7.2 +ARG BASE_TAG=17.8.0 ARG UBI_TAG=9.5 ## FINAL IMAGE ## diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 02822c35dd5151a432941e18356ad7f5c57bcbae..4d72d214da0f18dfc7187d08c94aba00cfe56ad8 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.2} +TAG=${3:-17.8.0} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 8e0a8aa310603fbc3b14a7d2475e255ccece7fc4..cef0e0cc72e933a2312b6662622133835c72ff77 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.2" + - "17.8.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-base" - BASE_TAG: "17.7.2" + BASE_TAG: "17.8.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.7.2" + org.opencontainers.image.version: "17.8.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"