diff --git a/Dockerfile b/Dockerfile index 50d252b371370c4ba8f2200109e530545eb659fb..2a4ffc7d33fd8a71a431e5c62d87b7e248ae0ffc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v14.1.0-ubi8 +ARG GITLAB_VERSION=v14.1.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.1.0 +ARG BASE_TAG=14.1.2 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 71e920786845d52964cef7c3c109e356a7bba982..1e5926b1e7f018747df04b6723704e73d340a26f 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.1.0} +TAG=${1:-14.1.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 1bed36f149aba6840af49a190f6d3174760a8a5c..35587bcb087f592cb2e85c5bc9ba4335c44f1475 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/git-base" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "14.1.0" + - "14.1.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "14.1.0" + BASE_TAG: "14.1.2" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Git-Base" @@ -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.1.0" + org.opencontainers.image.version: "14.1.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,8 +43,8 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/git-base.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/git-base.tar.gz" filename: "git-base.tar.gz" validation: type: "sha256" - value: "20cb70a441854896e1dc87bc447a53c90db9890df364c62254205d363dd5cf38" + value: "8776ae485b3e87cc49478d911368e2052c0166c0f906c70ddc8b8dc870ef9d13"