diff --git a/Dockerfile b/Dockerfile index 2a4ffc7d33fd8a71a431e5c62d87b7e248ae0ffc..bb90ed147daa369e0ffbbe5f7b35ffa1652bd89d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v14.1.2-ubi8 +ARG GITLAB_VERSION=v14.2.0-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.2 +ARG BASE_TAG=14.2.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/README.md b/README.md index 1d419b411fafa080093a2983cb7d19cbd9553fd7..db76339dc73f05c6370e3b5870bb7376e7869c36 100644 --- a/README.md +++ b/README.md @@ -36,5 +36,5 @@ Some of the GitLab containers are build ontop of previous containers, building t * gitaly - Phase 4 * gitlab-sidekiq - * gitlab-task-runner + * gitlab-toolbox * gitlab-webservice diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 1e5926b1e7f018747df04b6723704e73d340a26f..d109f57370a14f78467d0a0ec7c95db7fb7b0a35 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.1.2} +TAG=${1:-14.2.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 35587bcb087f592cb2e85c5bc9ba4335c44f1475..6c0ef755dba475d082f22bdba2eff11401b37e4f 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.2" + - "14.2.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "14.1.2" + BASE_TAG: "14.2.0" # 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.2" + org.opencontainers.image.version: "14.2.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.1.2-ubi8/git-base.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/git-base.tar.gz" filename: "git-base.tar.gz" validation: type: "sha256" - value: "8776ae485b3e87cc49478d911368e2052c0166c0f906c70ddc8b8dc870ef9d13" + value: "9a2a19cfdfd5b2b3f19fb15a0df8d4f061ad1397e89b9496efb7ae80f65c67bb"