diff --git a/Dockerfile b/Dockerfile index fe968f2f0a9201b07b5d3d09ed294071149441a7..dbfa03ff4a73e565d50411ab8505aed4ebf42b53 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 GITLAB_USER=git ARG GITLAB_DATA=/var/opt/gitlab ARG DNF_OPTS +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-rails" \ + name="GitLab Rails" \ + maintainer="GitLab Distribution Team" \ + vendor="GitLab" \ + version=${GITLAB_VERSION} \ + release=${GITLAB_VERSION} \ + summary="Rails container for GitLab." \ + description="Rails container for GitLab." + RUN dnf clean all \ && rm -r /var/cache/dnf \ && dnf ${DNF_OPTS} install -by --nodocs \ diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 13cff258d4a1e6cd2399a86ca957d0c80669a2c8..9dd07f03faf5fc719123f0c71c80348d5ca5cf59 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 8afadb8b686101c18a9c53e217a84113438fd359..487279490bd5034804f7773aec22affdf919fec0 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-rails" # 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 Rails" @@ -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-rails-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-rails-ee.tar.gz" filename: "gitlab-rails-ee.tar.gz" validation: type: "sha256" - value: "1059b34ef15d8d1acf64fe97b52c5b3c286fa6b9f06beb3cb82e4d6839c16dad" + value: "7f864e2c4419b77d8afae00cd410e81ad6b7ad0bceb0f63e16bd04cc459f8612"