diff --git a/Dockerfile b/Dockerfile index 44bd729209f2ac28651a5abead4fbc637f545f8d..b5f6ad4e6bc214c7ff3d290bd009c16941d86d37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.8.4-ubi8 +ARG GITLAB_VERSION=v13.9.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.8.4 +ARG BASE_TAG=13.9.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${RUBY_IMAGE} -ARG GITLAB_EXPORTER_VERSION=8.0.0 +ARG GITLAB_EXPORTER_VERSION=10.0.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/build-scripts/build.sh b/build-scripts/build.sh index f4c3ceb751547b6763cdbafa3173ad79e5fd22db..410e73a5b64f6809f114736c529818c26952c0a2 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.8.4} +TAG=${1:-13.9.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index d36f9a04927453da8c63af5dda8fd96e2d543d42..874423e1f942b8a799776a20e977f73fbd429ea8 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.8.4" + - "13.9.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.8.4" + BASE_TAG: "13.9.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.8.4" + org.opencontainers.image.version: "13.9.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.8.4-ubi8/gitlab-exporter.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.0-ubi8/gitlab-exporter.tar.gz" filename: "gitlab-exporter.tar.gz" validation: type: "sha256" - value: "997dbd393b3b2857a0532a22a8917be62f4e2241be4dd20b470edc52b3ed0de6" + value: "b393ed3b9a3217fbff0634932314ad86a378bdf250cf39ab1ddcabaa75e7eceb"