diff --git a/Dockerfile b/Dockerfile index 813ed52ffe64bbcecc423ea7ef4397461dd1816d..5fd9bb11ecb99f57860d64b84e468ab49b6c714d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v14.0.0-ubi8 +ARG GITLAB_VERSION=v14.0.2-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=14.0.0 +ARG BASE_TAG=14.0.2 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 15b7527e240c8243b0244d9c88bdd163942b4e6a..690d43ee997de914df8d6a3eb8a462d03d292e1c 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.0.0} +TAG=${1:-14.0.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b36967504c2c6780fc79e913f31b6be1514c20a2..81397794e31b5b8acb9380cbe0af7f1af4925f54 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: - - "14.0.0" + - "14.0.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "14.0.0" + BASE_TAG: "14.0.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: "14.0.0" + org.opencontainers.image.version: "14.0.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,18 +43,18 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-shell.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "b21c7cb6ade3e7302593f7e1c6dd8acb3643cd374a320cdfa9bd35738cfc6fa8" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-logger.tar.gz" + value: "2a5a29d82f6c7063845ed4a5e79dc7152b63cb047514c383b8a5a35d282a4b00" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "6b25556f20a8639a7fae19d3737089f9b9f9c74fbc35562f8a9ca85dde307c69" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-gomplate.tar.gz" + value: "48fdaff769c68ddecaeca5fe93ca09b01ee36ab2f9ee52e9d1870182591c0ed7" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-gomplate.tar.gz" filename: "gitlab-gomplate.tar.gz" validation: type: "sha256" - value: "f4464f8531b4370df41a08cbdf20ccc23ad6c083a5c375cb18de08052da4b06a" + value: "1c6b815c545657b8c7a40603f552473514f30d72a76808a0ab490f91a6825cfd"