From 3c09eb77ddaa9225dc340307e71343ccee7e3d93 Mon Sep 17 00:00:00 2001 From: Steven Terhar Date: Thu, 1 Jul 2021 20:21:53 +0000 Subject: [PATCH] Update GitLab to the 14.0.2 Security Release --- Dockerfile | 4 ++-- build-scripts/build.sh | 2 +- hardening_manifest.yaml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index c5b6ed4..6405459 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 e9ebc2b..cb74c4d 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 2c8434f..295527d 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-exporter" # 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 Exporter" @@ -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,8 +43,8 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-exporter.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-exporter.tar.gz" filename: "gitlab-exporter.tar.gz" validation: type: "sha256" - value: "bb2ef86210555cb3f7de22b5b03f7e8d9b1ac56051b2882c136460808ec07ed0" + value: "85ec104a2b19fc0760e6f2a55bd32f917642cf3d3a59ce8724c413eb6c1e3151" -- GitLab