diff --git a/Dockerfile b/Dockerfile index 47bacc9b9651b06e420edd068dc3cce28aafce79..d2c34d97a4f19a5b79e4bb00c32c9a6f576c089d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.12.8-ubi8 +ARG GITLAB_VERSION=v13.12.9-ubi8 ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/gitlab/gitlab/gitlab-rails -ARG BASE_TAG=13.12.8 +ARG BASE_TAG=13.12.9 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 851057ef61da1a07e18e9631cbadd6226e299bd8..1469f0491cb65a451be2a9d8454661ef2a04dcde 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.12.8} +TAG=${1:-13.12.9} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 017448f9e25ddcae5f69489f3c046c9288096374..d20a743dc3fdaab02d61cf3d2bf4d0030e877678 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -7,13 +7,13 @@ name: "gitlab/gitlab/gitlab-task-runner" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.12.8" + - "13.12.9" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-rails" - BASE_TAG: "13.12.8" + BASE_TAG: "13.12.9" # Docker image labels labels: @@ -26,7 +26,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: "13.12.8" + org.opencontainers.image.version: "13.12.9" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "gitlab, git, gitops" ## This value can be "opensource" or "commercial" @@ -48,13 +48,13 @@ maintainers: cht_member: true resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.8-ubi8/gitlab-task-runner-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.9-ubi8/gitlab-task-runner-ee.tar.gz" filename: "gitlab-task-runner-ee.tar.gz" validation: type: "sha256" - value: "423bd897ea662c97849c815d9740affd8afec5e6f09b1cae39ee6640d836a1a4" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.8-ubi8/gitlab-python.tar.gz" + value: "04b8eac37fbadc67cb2b86d7b2e0b66fe15afb0ec9fd93a2019e712c69c28d5f" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.9-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "fdc6c36934ba6f5e6c742f34325bc2e6c3dfea8aca7d97d7e455586f9e17d092" + value: "142a55eff824e60e3837711fd66508ed2b288d3555104da1d8326ffbc9dd50b0"