diff --git a/Dockerfile b/Dockerfile index efcde8eeff37314df45a4f5f72686b188e8a448b..af612f3ddfd4af3bb81b4b90e084d7049dcd1eac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.10.0-ubi8 +ARG GITLAB_VERSION=v13.10.1-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.10.0 +ARG BASE_TAG=13.10.1 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 e659e93132a39f8659dd4571eb8b4ca87901a55f..8960be32cd9219351ed67ddfc7a0ef09407f0045 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.10.0} +TAG=${1:-13.10.1} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 9cff4d30f61582d91b672e0218b9e2e587567f5a..ec3c9cced73c634df6b4296e6bc17b72e8ce14e3 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.10.0" + - "13.10.1" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.10.0" + BASE_TAG: "13.10.1" # 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.10.0" + org.opencontainers.image.version: "13.10.1" ## 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.10.0-ubi8/gitlab-exporter.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-exporter.tar.gz" filename: "gitlab-exporter.tar.gz" validation: type: "sha256" - value: "b68af8a73952b7b1d27094159cafbe48753e5d7aadfda2facc08370af53a221e" + value: "50db040640d83ff036957314287f455c818f1b21bb494109780933d2799cc974"