diff --git a/Dockerfile b/Dockerfile index f6a1e43c23a3e272003c2afbae54f29b6d365b30..38d04e04af93064e7a3e8c826f8ab4c3f1b1dcaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG GITLAB_VERSION=v17.9.2-ubi +ARG GITLAB_VERSION=v17.10.0-ubi ARG BASE_REGISTRY=registry1.dso.mil/ironbank ARG BASE_IMAGE=gitlab/gitlab/gitlab-base -ARG BASE_TAG=17.9.2 +ARG BASE_TAG=17.10.0 ARG UBI_TAG=9.5 ## FINAL IMAGE ## diff --git a/build-scripts/build.sh b/build-scripts/build.sh index ada61963d8d285618cccddf6b2736420c7761ccc..598ab6ff818a2761ea06bf1fbf9d390eb5b3474a 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.2} +TAG=${3:-17.10.0} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 5d7463f780a256ee0a6908826442a8f911423049..51e5de6604859b4050bce44b73c2be988aab1cf9 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.2" + - "17.10.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-base" - BASE_TAG: "17.9.2" + BASE_TAG: "17.10.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.9.2" + org.opencontainers.image.version: "17.10.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" @@ -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.2-ubi/gitlab-pages.tar.gz" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.10.0-ubi/gitlab-pages.tar.gz" filename: "gitlab-pages.tar.gz" validation: type: "sha256" - value: "42c9637e2bfa0c238b345f1e1e5af7471e8c2e7932a719ad7170adbba959eefb" + value: "a3c07d3a9fc666a0f37fea34de6fb349dd73f2ecd223f2422210668797b192b9"