diff --git a/Dockerfile b/Dockerfile index a3ab5cea2194e8f4fdb690adf210f374a20c364c..a80122f19ba23339fdb82ebc9a422a9cfc3dae39 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 fae4c23de22973c08fab188255b807be60098eb3..c405acbe1d2fd6d20f16897365c0d34d3639b94e 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 46c452990123d16a81b1d0309af9fdffa99b6e12..af650dd6b38eec8a93ca19424a2dc0d62439ba5d 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-rails" # 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 Rails" @@ -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/gitlab-rails-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-rails-ee.tar.gz" filename: "gitlab-rails-ee.tar.gz" validation: type: "sha256" - value: "d6314cb0b0b5fbc39897920f829f9a6304899b87578d1861e71e12c94b9b86e0" + value: "7d1de28f066928e21c7a8b0d8b81c81a6cd4837557a20dbdb047aa60b343490d"