diff --git a/Dockerfile b/Dockerfile index 520d06878459fd9624a3c47d1564b1c14298e861..a08922daacb4be24bf2b37d9924606231bfd6731 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.12.2-ubi8 +ARG GITLAB_VERSION=v14.0.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=13.12.2 +ARG BASE_TAG=14.0.0 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.12.2 +ARG GITALY_SERVER_VERSION=v14.0.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 845dce71c1e3971ca648c20adcca33f4ec85830d..f59c9552ab74bdcaab6b5680489d75c6759eafd4 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.12.2} +TAG=${1:-14.0.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index deedcd66b6ff365c0a107a3d712cbdd3fa9810a8..7666177f9e6028ae356caab717fbf1a497390ebc 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.12.2" + - "14.0.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/git-base" - BASE_TAG: "13.12.2" + BASE_TAG: "14.0.0" # 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.12.2" + org.opencontainers.image.version: "14.0.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.12.2-ubi8/gitaly.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "b9f964bf1e445cc96777a4d542239f8d45cf1a01dfd9b501c4b7e06c78bfd3c2" + value: "b7140a32b469f758883bbcc21c52520136da3ddc4f21366424826bab812d0474"