diff --git a/Dockerfile b/Dockerfile index 8e402062c200a7fc519579036d7c8a70ebf5880a..f9897bb06c7d925cb77a438756e824d7c571eede 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-ruby -ARG BASE_TAG=13.10.0 +ARG BASE_TAG=13.10.1 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -12,6 +12,15 @@ ARG MAILROOM_VERSION=0.0.9 ARG GITLAB_USER=git ARG DNF_OPTS +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-mailroom" \ + name="GitLab Mailroom" \ + maintainer="GitLab Distribution Team" \ + vendor="GitLab" \ + version=${MAILROOM_VERSION} \ + release=${MAILROOM_VERSION} \ + summary="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received." \ + description="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received." + ADD gitlab-mailroom.tar.gz / COPY scripts/ /scripts/ diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 03992931ec2c6ab2967b73c744c43008f7b60f6b..0c2ceec1cdaf54e1ce2db12b8aaa68e071f867ba 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 af225d63f95095f499c4a2d66d23942439f32c86..25b7f4f4436128baec3ea8bd2e1c2f14fda90f66 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-mailroom" # 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-ruby" - BASE_TAG: "13.10.0" + BASE_TAG: "13.10.1" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Mailroom" @@ -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,8 +43,8 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-mailroom.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-mailroom.tar.gz" filename: "gitlab-mailroom.tar.gz" validation: type: "sha256" - value: "2b3ae447055ced041077fdb17ee1c302cf5a523a046559d030468d6bcc15feb8" + value: "23f0b46e85072e3d0c54fa5eab1e4366aab101569c9e925a552f35a532b9ca16"