diff --git a/Dockerfile b/Dockerfile index 7fd944c00307108083e8b7a7ef146ba5b45f0dd0..3249c46e4906a62c46278f6af2404ccaf310d5ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v14.1.0-ubi8 +ARG GITLAB_VERSION=v14.1.2-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=14.1.0 +ARG BASE_TAG=14.1.2 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v14.1.0 +ARG GITALY_SERVER_VERSION=v14.1.2 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 3e127a8110807668a42dde211502fae7f0ecf745..5c6778091ef4c68529175fc85e84c36f26acd2be 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.1.0} +TAG=${1:-14.1.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 560c20bbc3c57927095aaec43f71af7c2893d38a..038013e54a8e79508c8a621c00aa55cf59d1d3b5 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: - - "14.1.0" + - "14.1.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/git-base" - BASE_TAG: "14.1.0" + BASE_TAG: "14.1.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: "14.1.0" + org.opencontainers.image.version: "14.1.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" @@ -47,13 +47,13 @@ maintainers: username: "adam.martin" cht_member: true resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitaly.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "1f193334b749dc3b12d1da9d46f6cc4f990ad159c3ac470d293c6a92a094bb57" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-logger.tar.gz" + value: "f3829110210e4a77c2639d8ec225e4e615517b3120495a8ffd288697725dbcd1" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "674bc89c3f6e577236feeadccc6adb3f380e014f8f474004ff96f93f3144eb28" + value: "afe1470c7f1d137bf568ce36bd617299926c91bd05bf0b94e409861b2d72af06"