diff --git a/Dockerfile b/Dockerfile index f184dd3d706becb162f1e71d18764bd54f4302da..e5edf899dcc4fc3d139ae9adb8476b73215411d3 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-ruby -ARG BASE_TAG=17.9.1 +ARG BASE_TAG=17.9.2 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 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 6b7ff8b2f0fd15131183c9e80287e9ec0cbc37b7..4ff703cb416b44200319d3e4887faaf1ee3347e3 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.9.1" + - "17.9.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - 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" @@ -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.9.1-ubi/gitlab-mailroom.tar.gz" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.9.2-ubi/gitlab-mailroom.tar.gz" filename: "gitlab-mailroom.tar.gz" validation: type: "sha256" - value: "563e9b65aba9d5fff0edd3458e7009a74873aed4db35c211e35ba06db74b9ef2" + value: "29bfbcc8dfbfc292ffcd684f3992291ec40bdf57365cb9554e949c1c600dd869"