diff --git a/Dockerfile b/Dockerfile index 3de9532d9419a35bd03ef7fc1e7c3616500ebefa..fdb0d2954aa564b87d519d368848b4ea7e917473 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG GITLAB_VERSION=v17.9.0-ubi +ARG GITLAB_VERSION=v17.9.1-ubi ARG BASE_REGISTRY=registry1.dso.mil/ironbank ARG BASE_IMAGE=gitlab/gitlab/gitlab-base -ARG BASE_TAG=17.9.0 +ARG BASE_TAG=17.9.1 ARG UBI_TAG=9.5 ## FINAL IMAGE ## diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 30c7b33ea894b6297b57fae466c929606816cd3c..f8dc8d14a1f8b7833d285f0f90590a3fe305b0c9 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.0} +TAG=${3:-17.9.1} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 3ac66cf3318aa5f0cedddeea42a490eb7d32ae59..f0248cd84db40350890eb0bd73ca69218126e26d 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-pages" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "17.9.0" + - "17.9.1" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-base" - BASE_TAG: "17.9.0" + BASE_TAG: "17.9.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.9.0" + org.opencontainers.image.version: "17.9.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.9.0-ubi/gitlab-pages.tar.gz" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.9.1-ubi/gitlab-pages.tar.gz" filename: "gitlab-pages.tar.gz" validation: type: "sha256" - value: "546ac2d8bc52f0f774bd9419b4cef7a790675c8de9a83af76516fc1abc515611" + value: "31fb1bf17247a15c2ae406fb857f3d5f698da7aae027b9ea108f45d782dcdb48"