diff --git a/Dockerfile b/Dockerfile index e3a10ceddafac09f6595efd1bfe3324fedaca90d..acb4876217cdb3abf3a5b6e970e7aa6c163a1a81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.11.0-ubi8 +ARG GITLAB_VERSION=v13.11.2-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.11.0 +ARG BASE_TAG=13.11.2 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 9991bd298f4ca585afd51763b34791cbaaa4fc42..b02152938ccf88dec372acf3c77a6834ec8c7ef6 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.11.0} +TAG=${1:-13.11.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 3b65ac6e9b65b999bab4725fdec62904fa66f0f4..295def740e6d16ba3b0f6de55c5e9c72f0515956 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-shell" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.11.0" + - "13.11.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.11.0" + BASE_TAG: "13.11.2" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Shell" @@ -22,7 +22,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.11.0" + org.opencontainers.image.version: "13.11.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" @@ -43,13 +43,13 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-shell.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.2-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "b2ffeb23cffef6cd01b81ce7ee077ddd47f0911ddeb6a7d9dd36eb2c15f9f52d" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-logger.tar.gz" + value: "028062568c87b5fe89519e8f32547086faca8c04d37b83da0778af02679c8e04" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.2-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "b48ecbb91aebda8cd5a2e5369b0c226da4b0e25510815b6abd6becd4a4a148a7" + value: "f24ec8e10c112ef3e7b1de6f55f642c3e63171d1f3f9fd24cb0b7f1bad0a7a1b"