diff --git a/Dockerfile b/Dockerfile index 40934fe8f826e923b2b7ceee3d9a3fdadebe4b3d..90d6c4596bd38dff4194dfb4712f08d0939feabc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,26 @@ -ARG GITLAB_VERSION=v13.9.3-ubi8 +ARG GITLAB_VERSION=v13.10.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.9.3 +ARG BASE_TAG=13.10.0 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.9.3 +ARG GITALY_SERVER_VERSION=v13.10.0 ARG GITLAB_USER=git ARG DNF_OPTS +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitaly" \ + name="Gitaly" \ + maintainer="GitLab Distribution Team" \ + vendor="GitLab" \ + version=${GITALY_SERVER_VERSION} \ + release=${GITALY_SERVER_VERSION} \ + summary="Gitaly is a Git RPC service for handling all the git calls made by GitLab." \ + description="Gitaly is a Git RPC service for handling all the git calls made by GitLab." + ADD gitaly.tar.gz / COPY scripts/ /scripts/ diff --git a/build-scripts/build.sh b/build-scripts/build.sh index d532d8031c21109083ab04d2a7e98e761d04a4d9..1cd9408f2a444cdf67dfdd1265a6ce8549b7526c 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.9.3} +TAG=${1:-13.10.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 9d1bb92d0cd98c5ae276f1ec51ba20ea9f88b526..2fb6f808151f3cc5a9dc82cf32cbbc8b415a1f87 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.3" + - "13.10.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/git-base" - BASE_TAG: "13.9.3" + BASE_TAG: "13.10.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.9.3" + org.opencontainers.image.version: "13.10.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.9.3-ubi8/gitaly.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "a2979a54ef9e9cce8148e0693b5133fe3c7c77b72d602b29bf1396f7ec3e3f97" + value: "a68fbda721c0c98949e9aab2974c9dcd983c467c505261db201289c5d5b3baa9"