diff --git a/Dockerfile b/Dockerfile index c41fe154f8e4bbeb8ae71ff2d7e63fa9630f9f3d..73f6390c0374a9c2fbeab38aee355ce8e684e8c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.9.3-ubi8 +ARG GITLAB_VERSION=v13.10.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.9.3 +ARG BASE_TAG=13.10.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -12,6 +12,15 @@ ARG GITLAB_EXPORTER_VERSION=10.0.0 ARG GITLAB_USER=git ARG DNF_OPTS +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-exporter" \ + name="GitLab Exporter" \ + maintainer="GitLab Distribution Team" \ + vendor="GitLab" \ + version=${GITLAB_EXPORTER_VERSION} \ + release=${GITLAB_EXPORTER_VERSION} \ + summary="Prometheus Web exporter for GitLab." \ + description="Prometheus Web exporter for GitLab." + ENV CONFIG_TEMPLATE_DIRECTORY=/var/opt/gitlab-exporter/templates ENV CONFIG_DIRECTORY=/etc/gitlab-exporter ENV CONFIG_FILENAME=gitlab-exporter.yml diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 514c89148ae983007ee387b2688144db4be68d87..e659e93132a39f8659dd4571eb8b4ca87901a55f 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.9.3} +TAG=${1:-13.10.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 43bcc96e1577bc2105e320c9e6ffba9d91d95a80..9cff4d30f61582d91b672e0218b9e2e587567f5a 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: - - "13.9.3" + - "13.10.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.9.3" + BASE_TAG: "13.10.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: "13.9.3" + org.opencontainers.image.version: "13.10.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.9.3-ubi8/gitlab-exporter.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-exporter.tar.gz" filename: "gitlab-exporter.tar.gz" validation: type: "sha256" - value: "e37e5bd81ca49d0f0ebd920f09357a206dd8adef89647fc5176a6948fb180f12" + value: "b68af8a73952b7b1d27094159cafbe48753e5d7aadfda2facc08370af53a221e"