diff --git a/Dockerfile b/Dockerfile index f8600a1cefbc8325c66ef0537a2e59c3e45efea9..17130619cd9a4572303fd1fe086b77a2a3cf64c6 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 cb068b9349cca3bbd1122d96eb601a976b6d9249..2556dce17bb94d4e4296670e1fd371aadc7697c8 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 bcd06e81e573dfc701ad2a4c8f2f9fef10775821..0313eeead50fbe6cc2fdd9b18fdce403951f772e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -7,13 +7,13 @@ name: "gitlab/gitlab/gitlab-webservice" # 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,18 +48,18 @@ maintainers: cht_member: true resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.8-ubi8/gitlab-webservice-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.9-ubi8/gitlab-webservice-ee.tar.gz" filename: "gitlab-webservice-ee.tar.gz" validation: type: "sha256" - value: "f8165391ed5a5ef1c073869b422c963ee425d9111de779bdca7843aef5e3115f" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.8-ubi8/gitlab-python.tar.gz" + value: "faa897aa9c16f52617153febd464fcb8a3caba3b26e7796c278023840d3a6ac0" + - 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" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.8-ubi8/gitlab-logger.tar.gz" + value: "142a55eff824e60e3837711fd66508ed2b288d3555104da1d8326ffbc9dd50b0" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.9-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "2ba4b86c3943194780d44e9e166da413294fc48f7b981bffb9f7eef0a77ca9f0" + value: "74d4bdb43772d848f6512270e36f025a851c2c76bdd48426c56921d0b42a701e"