diff --git a/Dockerfile b/Dockerfile index 9e52f7b7adb1d3ec4f05e9b95ea2e41fd4f2d3e2..cbf9af0cffd9156dfdcf356fbaf0098654a2dd65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.9.0-ubi8 +ARG GITLAB_VERSION=v13.9.2-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails -ARG BASE_TAG=13.9.0 +ARG BASE_TAG=13.9.2 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 5d2a26f9f9c50a76893e24b8da8fcca26d946136..2a0a20b58009774f329b8129656de88ae5137f26 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.9.0} +TAG=${1:-13.9.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e755fefb4e564fd78dd01fbe3576932ba639affe..7448dccaa33c8b0d66b1b1eb706e8353415df95e 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.9.0" + - "13.9.2" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-rails" - BASE_TAG: "13.9.0" + BASE_TAG: "13.9.2" # 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.9.0" + org.opencontainers.image.version: "13.9.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" @@ -43,18 +43,18 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.0-ubi8/gitlab-sidekiq-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.2-ubi8/gitlab-sidekiq-ee.tar.gz" filename: "gitlab-sidekiq-ee.tar.gz" validation: type: "sha256" - value: "571285fd881c3ff483d1d83a5f6e27c701b0620aa96c7dd189bc897fea773248" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.0-ubi8/gitlab-python.tar.gz" + value: "7764eb298c1b9b70fa226d7cf47a35694978e5886e2b59eefcdcd7e197fc8b5b" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.2-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "10d061bb58278ad4a75827078105f011f126eec1cb40bd38f5ad7277ce2e169d" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.0-ubi8/gitlab-logger.tar.gz" + value: "d3aa2a7e09f23ae2c81799a938a77bd64a0c4e6d120e9eb17bdc78fefb2b4370" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.2-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "75fafdb14ba52d988a3dc8517c6a03b7b1fe007d05400be1b88b1c706c65484d" + value: "11b655e964b09b3b2a3157f338f017631328d1bb105e65ee4d83a1f9ff520c6c"