diff --git a/Dockerfile b/Dockerfile index 6caecc52b6b570e14414ae150e082e2816fb537f..b843c2196658354e853f5060f0f26780df374ecf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG GITLAB_VERSION=v17.8.0-ubi +ARG GITLAB_VERSION=v17.8.1-ubi ARG BASE_REGISTRY=registry1.dso.mil/ironbank ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=17.8.0 +ARG BASE_TAG=17.8.1 ARG UBI_TAG=9.5 ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 4d72d214da0f18dfc7187d08c94aba00cfe56ad8..3dd7725a68d7390f54d1981ef15cde4f02aac4f6 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.8.0} +TAG=${3:-17.8.1} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index d77bf5f65207c726566282a8373206b9ab473721..b0c98012fea9665b3c518cb21996508abb5b720b 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -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.8.0" + - "17.8.1" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "17.8.0" + BASE_TAG: "17.8.1" 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.8.0" + org.opencontainers.image.version: "17.8.1" ## 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.8.0-ubi/gitlab-mailroom.tar.gz" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.8.1-ubi/gitlab-mailroom.tar.gz" filename: "gitlab-mailroom.tar.gz" validation: type: "sha256" - value: "0164827238790507a7886fe55810527e5d9f2b891c1ec570f8555eb39f8dfc1f" + value: "ebeb755d1f13b9f63f80303bf984c135717b8722d116bce17783dfc47a81be5e"