diff --git a/Dockerfile b/Dockerfile index 3f7e45b1f4e5653d9a82a74c376994a96d4b9b5b..63f98584f1c3ccd5b5bd39200be51fe90b702e67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v14.0.5-ubi8 +ARG GITLAB_VERSION=v14.1.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.0.5 +ARG BASE_TAG=14.1.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${RUBY_IMAGE} -ARG GITLAB_EXPORTER_VERSION=10.3.0 +ARG GITLAB_EXPORTER_VERSION=10.5.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/build-scripts/build.sh b/build-scripts/build.sh index d9adad10f40452898dfef1698de9013f9844603b..376938b969bced1eeb46e57f50116471fe23c823 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.0.5} +TAG=${1:-14.1.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 7e0fbad62b0ddd9a6a9fc381ff8239a0b656aadb..d409f23c7702af688b875017930568e4e963ae33 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.0.5" + - "14.1.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "14.0.5" + BASE_TAG: "14.1.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.0.5" + org.opencontainers.image.version: "14.1.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" @@ -42,9 +42,13 @@ maintainers: - name: "Al Fontaine" username: "alfontaine" email: "alan.fontaine@centauricorp.com" + - email: "adam.martin@rancherfederal.com" + name: "Adam Martin" + username: "adam.martin" + cht_member: true resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-exporter.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-exporter.tar.gz" filename: "gitlab-exporter.tar.gz" validation: type: "sha256" - value: "66dd0f95bb767b3f713435291aec85934ce488467cc1f4b3620f7a04aa7a75c1" + value: "0908cfd553a82ab5c24860ed209cf9884bbd61ef5342e71848ec1005efe59211"