diff --git a/Dockerfile b/Dockerfile index f21e7f681ea0847874b69f9baaaab52c6cd987e5..4d32768bf1710c810e29e5bf294352c6530e9bc0 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_SHELL_VERSION=v13.17.0 ARG GITLAB_USER=git ARG DNF_OPTS +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-shell" \ + name="GitLab Shell" \ + maintainer="GitLab Distribution Team" \ + vendor="GitLab" \ + version=${GITLAB_SHELL_VERSION} \ + release=${GITLAB_SHELL_VERSION} \ + summary="SSH access and repository management app for GitLab." \ + description="SSH access and repository management app for GitLab." + ADD gitlab-shell.tar.gz / ADD gitlab-logger.tar.gz /usr/local/bin diff --git a/build-scripts/build.sh b/build-scripts/build.sh index d654a95108ec41034931812803ff651309f66e0d..47e56ed941b7101e6d4306f9cc7db9e0a5792f63 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 e3270c86aae32cc06954fe45f9515514fcc68c57..b2be01c9100c1136d82b772a9ed4eb6938652c3b 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-shell" # 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 Shell" @@ -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,13 +43,13 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-shell.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "f7548a0d4f200ec2a0ff28da25786b74e73a4205a4ffb2e405f251396ad79fcc" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-logger.tar.gz" + value: "163a30d08ac770662464e0b8d8fc5786cd1ea73ebab52dba325268ba179d8dec" + - 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"