diff --git a/Dockerfile b/Dockerfile index 1fffd7ef21abaa070676b8764ddc2f025c3856eb..ab4f836d1c37276613ea0b86a7d18ce61d299474 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.11.2-ubi8 +ARG GITLAB_VERSION=v13.12.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.11.2 +ARG BASE_TAG=13.12.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index bc73c7c5291ba08e2a85c1ad9c11539c1916b422..5b297f4f1a3113d184fb423561d6ff19892ebe9c 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.11.2} +TAG=${1:-13.12.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 0ff6165cf9c2f06c032eabd02ffe6e1522d42bbb..adcc2b763438954186e43803dd98c57cc0253d7e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-mailroom" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.11.2" + - "13.12.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.11.2" + BASE_TAG: "13.12.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Mailroom" @@ -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: "13.11.2" + org.opencontainers.image.version: "13.12.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-v13.11.2-ubi8/gitlab-mailroom.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.0-ubi8/gitlab-mailroom.tar.gz" filename: "gitlab-mailroom.tar.gz" validation: type: "sha256" - value: "0cca58350a42b958dbe00ab338e841982aa758ae2fb2eee171694f4b8e1374fa" + value: "dabc8da89e8745310754fd6c4df62fbbd98401f4cbaa6cf4b6108a9272374ac8"