diff --git a/Dockerfile b/Dockerfile index ece1b32986c3b6f1a5f3e2690ed8c6cc451ef0b0..bfacc4628e4806ed0791094a45e6742abae227eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.9.0-ubi8 +ARG GITLAB_VERSION=v13.9.2-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=13.9.0 +ARG BASE_TAG=13.9.2 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.9.0 +ARG GITALY_SERVER_VERSION=v13.9.2 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/build-scripts/build.sh b/build-scripts/build.sh index f78562c25a72214760865cd6aeccbf70a41d7ee0..a5328bf82f4175ae6b704108c10c9c7dbcc1e75c 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.9.0} +TAG=${1:-13.9.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 8448cc7c9c2898533a76d5f9d838b57f1028cfef..0b4f6f0404169e946825bc281e11e62dada87f58 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitaly" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.9.0" + - "13.9.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/git-base" - BASE_TAG: "13.9.0" + BASE_TAG: "13.9.2" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Gitaly" @@ -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.0" + org.opencontainers.image.version: "13.9.2" ## 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.0-ubi8/gitaly.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.2-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "09207e6acee4e1c9d13fb227cfc2f3fd758b92169b20890a5bd56d1b97b5d31c" + value: "d4a59fa31420f92dc715a42cb73a9f847c6a1363707fec42cee5a5fdf5ef164e"