diff --git a/Dockerfile b/Dockerfile index 266aaf328f412c42785129069ec23e74839e040f..aeb627cde992947e46df130c25830c5e717b9379 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.8.2-ubi8 +ARG GITLAB_VERSION=v13.8.4-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails -ARG BASE_TAG=13.8.2 +ARG BASE_TAG=13.8.4 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 79231b8b27294d40168872a131f46f6eceaad791..4842324ea6203595efce6d89bc0d7cb893f512f0 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.8.2} +TAG=${1:-13.8.4} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 3655ac07bd294d4177f7d087dfa558163c633ea9..af89b0e8d0d0741406aeaf55f3243a86b5751d53 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: - - "13.8.2" + - "13.8.4" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-rails" - BASE_TAG: "13.8.2" + BASE_TAG: "13.8.4" # 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: "13.8.2" + org.opencontainers.image.version: "13.8.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" @@ -43,18 +43,18 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-sidekiq-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.4-ubi8/gitlab-sidekiq-ee.tar.gz" filename: "gitlab-sidekiq-ee.tar.gz" validation: type: "sha256" - value: "8c156851a951dae8ffe34bcf064c5dd61008273e3f9edaf2b152a2d935d3541e" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-python.tar.gz" + value: "d64991f24ec8925019ec1a6ce110565774a0f232a983b648ef21f72ed0cdcf00" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.4-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "9dbafedfec8e6ae808661b8fa05b2c31378de35229f0978c391e2fecefced50a" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-logger.tar.gz" + value: "21dd1d25434e6bb93781bf3db32d69f9a19f3b46152b300b392c33211b965b25" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.4-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "266a2f11d57220fa23b8b96d3c26ae3a83f1c5225f6ab23afa7a05addc11c4c6" + value: "e944dd0268a2f276c45e4f24f72358dd23f87945baaed154ed0c0165dd582cb6"