diff --git a/Dockerfile b/Dockerfile index ba0e7a3dcebb51eeb25770cd68fa556bdd4a7c99..7808db2801de97f85baf7a69bf9189f245db1996 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.10.0-ubi8 +ARG GITLAB_VERSION=v13.10.1-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails -ARG BASE_TAG=13.10.0 +ARG BASE_TAG=13.10.1 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -12,6 +12,15 @@ ARG GITLAB_VERSION ARG GITLAB_USER=git ARG DNF_OPTS +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-sidekiq" \ + name="GitLab Sidekiq" \ + maintainer="GitLab Distribution Team" \ + vendor="GitLab" \ + version=${GITLAB_VERSION} \ + release=${GITLAB_VERSION} \ + summary="Sidekiq daemon." \ + description="Sidekiq daemon." + ENV SIDEKIQ_CONCURRENCY=25 ENV SIDEKIQ_TIMEOUT=4 diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 9e30c68a43ebc34fe3fbe9e5594bd102fa11b437..cb0c507b04272d92383554f2d21d30bd59fb5517 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.10.0} +TAG=${1:-13.10.1} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 82f21b4b16a2b4928bee2eedfebe541ee3eaff2d..b9fc177c56375ba73761c82439aef10f60c8e6b9 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.10.0" + - "13.10.1" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-rails" - BASE_TAG: "13.10.0" + BASE_TAG: "13.10.1" # 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.10.0" + org.opencontainers.image.version: "13.10.1" ## 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.10.0-ubi8/gitlab-sidekiq-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-sidekiq-ee.tar.gz" filename: "gitlab-sidekiq-ee.tar.gz" validation: type: "sha256" - value: "02c0c73aaaedf396257ff28dbe98f84c59456bc6569ddb6652c985aff1a68201" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-python.tar.gz" + value: "36c0a552255fc2d4e7228bc3280cf74d579046a442e5bcc493d8d90ff0bf0742" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "3e24e604dc632bd8ce5af666dfb2ff0b82615cc43a213cfd70d8b47700121ff9" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-logger.tar.gz" + value: "6d33ee36e26164593cb3b0236782bf5b50140530d77e1c0ca43d641da1c9a01b" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "3b62c41e020fff9f4178da60872a61ced111e2955d3a862515293b509267ef81" + value: "d7b7acbe539fe35e439a536dbcce7f01eac4513c1497cefbad3cdc51a3dfc2c9"