diff --git a/Dockerfile b/Dockerfile index 7d41f4d3621790e34a8df65206378fcfaa93fb5c..0db822a714e837bad98c147b3a072d54833b7352 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v14.0.2-ubi8 +ARG GITLAB_VERSION=v14.0.5-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails -ARG BASE_TAG=14.0.2 +ARG BASE_TAG=14.0.5 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 64c8872d8d958e87ca75957d62e05b9ae87b0abf..ae53d8c47d640ccf4b65190b868f0687732321c8 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.0.2} +TAG=${1:-14.0.5} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 1b5db0145c8b1059687fca55794141f3f02d9b23..b74e4f4d5b2d7d44fedc6e38157d7539663fcfe7 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-sidekiq" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "14.0.2" + - "14.0.5" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-rails" - BASE_TAG: "14.0.2" + BASE_TAG: "14.0.5" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Sidekiq" @@ -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.0.2" + org.opencontainers.image.version: "14.0.5" ## 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,18 +43,18 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-sidekiq-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-sidekiq-ee.tar.gz" filename: "gitlab-sidekiq-ee.tar.gz" validation: type: "sha256" - value: "9bfae16f18ac546c303e2b83e3e623b08240921dc262532ca4d0e14d5bc5bdf8" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-python.tar.gz" + value: "346dd85e46ee1c02100a47541a93f6aa3258cc8c08bd67aadba19a3e1c907852" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "4db71b90cfb74ebe25ea502abac9af917fe4bf8e34e0e2808a6f717e28ecdd2d" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-logger.tar.gz" + value: "888cc1160f8d04084b6f685d213cfc0cfd58cd3f2c8ec7ad0395e6dfc421d346" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "48fdaff769c68ddecaeca5fe93ca09b01ee36ab2f9ee52e9d1870182591c0ed7" + value: "7a889bef692990d4b7581b23c5a1f3a0b320ed3bb33c38bde30b5cc3afb72d63"