diff --git a/Dockerfile b/Dockerfile index a14b8d5d7dd9e7fddb575b08f668021950bcd3f6..219a22d49c54617c77558eea2c7dc0ec61acebee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.7.2-ubi8 +ARG GITLAB_VERSION=v13.7.4-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.7.2 +ARG BASE_TAG=13.7.4 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index b33d9709d5075e716e2b4361f9d751939c173517..a6684abcf1885213412d8d21db1f784ac1987a48 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.7.2} +TAG=${1:-13.7.4} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index c6ca711d98fa80ed1310c214816a96c48de0fccf..013bc1035fae12acd1e61ecbdd41d71de6c645d8 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,13 +8,13 @@ name: "gitlab/gitlab/git-base" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "13.7.2" +- "13.7.4" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.7.2" + BASE_TAG: "13.7.4" # Docker image labels labels: @@ -27,7 +27,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.7.2" + org.opencontainers.image.version: "13.7.4" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "gitlab, git, gitops" ## This value can be "opensource" or "commercial" @@ -39,10 +39,10 @@ labels: # List of resources to make available to the offline build context resources: - filename: git-base.tar.gz - url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.2-ubi8/git-base.tar.gz + url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/git-base.tar.gz validation: type: sha256 - value: 301f19f4cce5e44053a948e0bddd33ae4f582140950f90bf09d54a204d4393f9 + value: ca2a496a0848cf6e0f45d74c3c5eccc823fd72087335e8559a422749aa3826dc # List of project maintainers # FIXME: Fill in the following details for the current container owner in the whitelist