From 4be420a8a03faf16957ecc7f44bfddc70173a1f6 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Thu, 22 Jul 2021 13:34:31 -0700 Subject: [PATCH] Update GitLab to the 14.1.0 Minor Feature Release --- Dockerfile | 2 +- build-scripts/build.sh | 2 +- hardening_manifest.yaml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c83390..7eed017 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GITLAB_VERSION=v14.0.5-ubi8 +ARG GITLAB_VERSION=v14.1.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=redhat/ubi/ubi8 diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 2e44ce8..a48940b 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.0.5} +TAG=${1:-14.1.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index f0cb337..6613462 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,7 +5,7 @@ name: "gitlab/gitlab/gitlab-ruby" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "14.0.5" + - "14.1.0" - "latest" # Build args passed to Dockerfile ARGs args: @@ -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.5" + org.opencontainers.image.version: "14.1.0" ## 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.0.5-ubi8/gitlab-ruby.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-ruby.tar.gz" filename: "gitlab-ruby.tar.gz" validation: type: "sha256" - value: "6c585a7616056442eb1bbca9c8e5768d2e63aa6f7fb443d7d40630c5f7a35809" + value: "5dcd05b9ac78c1970776c52e3718cd6e5d7861008eb79c98f4fbcd1b23bb32d3" -- GitLab