diff --git a/Dockerfile b/Dockerfile index e210258115acb430f1d313d78da9498ab163603a..53ad0f73d0a711918aea1200871908dde550be63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -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} FROM ${RUBY_IMAGE} -ARG GITLAB_EXPORTER_VERSION=10.5.0 +ARG GITLAB_EXPORTER_VERSION=11.2.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/README.md b/README.md index dea52da2ba6152585a922af8571cc0b045e9c977..0b826ea65ca272a481ceec4a023e447c06a311a8 100644 --- a/README.md +++ b/README.md @@ -37,5 +37,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 05b4c1171a99242f01af5345814ef4adad8470f2..9afd8fc1b68b36eb414645012f3420079298b15c 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 69437a8906924440fabb5f2132172e2dc6811fc9..1e80136ed8d03e080e329a1b098488aca9383c14 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.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 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.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" @@ -47,8 +47,8 @@ maintainers: username: "adam.martin" cht_member: true resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-exporter.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-exporter.tar.gz" filename: "gitlab-exporter.tar.gz" validation: type: "sha256" - value: "05de83cb5b28ae83388551d8289ced580c59625e5e7041b563aa849320a29425" + value: "30db77a47da3b256a89c13bb56f4f31e90a6885e0d847fad0bbc964f1e2c8431"